Fix wrong using of Metadata in 15,16 migrations

In up>down>up mode migrations are failing due to using of common MetaData.
It should be declared separatly for both of migration methods.

Fixes-Bug: #1240898
Change-Id: I8f6555ce44204e79a9c47b7caa1fe05970f4e3f0
Merge "Fix wrong using of Metadata in 15,16 migrations"