api/migrationmaster: Fix errors due to rebase
api/migrationmaster: Fix errors due to rebase

ericsnowcurrently/juju,ericsnowcurrently/juju,marcmolla/juju,marcmolla/juju,mikemccracken/juju,mjs/juju,AdamIsrael/juju,mjs/juju,mjs/juju,marcmolla/juju,frankban/juju,reedobrien/juju,anastasiamac/juju,frankban/juju,anastasiamac/juju,mjs/juju,reedobrien/juju,waigani/juju,AdamIsrael/juju,bac/juju,waigani/juju,reedobrien/juju,alesstimec/juju,waigani/juju,frankban/juju,anastasiamac/juju,waigani/juju,alesstimec/juju,AdamIsrael/juju,mjs/juju,mjs/juju,mikemccracken/juju,mikemccracken/juju,marcmolla/juju,ericsnowcurrently/juju,alesstimec/juju,alesstimec/juju,bac/juju,AdamIsrael/juju,reedobrien/juju,ericsnowcurrently/juju,marcmolla/juju,mjs/juju,frankban/juju,alesstimec/juju,frankban/juju,reedobrien/juju,mikemccracken/juju,bac/juju,mikemccracken/juju,ericsnowcurrently/juju,anastasiamac/juju,bac/juju,bac/juju,anastasiamac/juju