 merge trunk, fixed unittests, added i18n strings, cleanups etc etc.
 merge trunk, fixed unittests, added i18n strings, cleanups etc etc.

openstack/oslo.versionedobjects,citrix-openstack-build/oslo.versionedobjects