Revert "BBB for the old marker interfaces for Location, Attendees and Contact"

This reverts commit 5f319091ab1c08b154ca01568144264baea94979.
make sure to actually include the upgrades for dx
added upgrade step to migrate the annotation storage from behavior fields
Added a test for the annotation to attribute storage migration