I refactored your check in at revs 62576-62578
Here are the main issues that I found:
1.) Deprecating the methods for addMessage without a format actually causes bugs. For example, MBPortletDataHandlerImpl could "export" a html format but "import" in bbcode because that's the default.
2.) Upgrade didn't fully do all of the upgrades. See rev 62578. Specifically, you missed portal-data-release.sql and the UpgradeProcess6_1_0 was pointing to the wrong upgrade class.
Please review all the ungenerated files that I changed, retest, and then close this ticket.