Issue: [4.1 Beta 3] XF1.5 -> XF2.1: 1) VW bbcode not parsing, 2) missing admin cp bbcode phrases

After upgrading a test installation from:
XenForo 1.5 + VaultWiki 4.1 Beta 3 b002
to
XenForo 2.1 + VaultWiki 4.1 Beta 3 b002


1) VW BBcodes do not parse on wiki pages until I manually disable and then enable one bbcode. This may be a duplicate of issue 5751, however on this occasion core XF bbcode is not affected, only VW custom bbcodes. The screenshots only show the TEMPLATE bbcode, although I did also try WIKI, which behaved the same as TEMPLATE, and B, which behaved correctly at all times.

Prior to disabling/enabling a custom bbcode, I checked the VW Site Config options in case there was a possible notice about the wiki being disabled for a deferred task, but there was no notice of the sort. No changes were made to the options and then I proceeded to disable and then enable one custom bbcode and this resolved the parsing problem.

Pre-XF2.1 upgrade (XF1.5):

Attachment 1698

Post-XF2.1 upgrade, before disabling & re-enabling a custom bbcode:

Attachment 1699

Post-XF2.1 upgrade, after disabling/renabling a custom bbcode:

Attachment 1700

2) Within the admin cp, custom bbcode title and description phrases are missing for all of VW's bbcodes except [inject]. Below is a screenshot:
Attachment 1701