When start/scale fail, undo any changes made
Merge remote-tracking branch 'origin/pr/215'

Signed-off-by: James Myers <jmyers@pivotallabs.com>