Merge changes from topic "tow-2-rollback-no-flag" into udc-d1-dev

* changes:
  Test new upgrade steps
  Update the behavior to match the documentation.