Users/sachinma/vmss bug fix (#7248) (#7336)

* Fixing the issue where manual upgrade mode of the Vmss was failing.

* Fixing test issues

* Fixing comment

Author: sachinma