Bug 955463: Move hot deploy logic into the v2 model

Consolidate all hot deploy logic into the v2 model to enforce consistency
of application state.