add/remove migrations in order to sync master with develop

@hmunfru