finish migration from mana-fwk to hwaf organization