Split out disabling o-c-c from pushing updates

We will want to disable o-c-c before calling Heat's stack-update