WL-2968 Upgrade to 2.1

Pulling in the changes we have made to Mneme locally to the trunk code. See the issue for an explicit list of features.