Revert "Enhance versionutils.deprecated to work with classes"

This reverts commit f72d7ea1a02b7da838d003b0092c18bffce96e90.

* The reverted change being merged into oslo-incubator upstream
* Also, change icehouse -> juno

Change-Id: Ie12fcef5777ae724bf687ca1ad064aef6670f097
Merge "Revert "Enhance versionutils.deprecated to work with classes""