Comment 13 for bug 1678109

Operators and users may experience this as a regression when upgrading to Newton. The patch that has now merged into master would providers a workaround that still allows them to use the new launch-instance workflow. To provide a smooth upgrade path, it would be good to have the patch in Newton and Ocata too. So I cherry-picked this change to the stable/ocata and stable/newton branches. The cherry-picked applied cleanly. One test had to be updated due to a change in the size of a data structure.