am ca853c4a: Merge "Removing antiquated migration path logic" into ub-now-nova

* commit 'ca853c4a351991c3be8b0939733990d88249a61e':
  Removing antiquated migration path logic