Upgrade logic for dropping a column thats not part of the entity definition

Fixes EUCA-5877