Remove ordering attempts of 'unorderable types'
Remove ordering attempts of 'unorderable types'

Python 3 is more strict in ordering container elements and raises errors
when attempted to order unorderable types like dicts.
So, fix such places and replace them with proper things.

Partially-Implements: bp py3-compatibility
Change-Id: Ife20b4b112aae9ff4a784c54e2ad7b2f518ab4a9

scality/manila,vponomaryov/manila,vponomaryov/manila,scality/manila,bswartz/manila,jcsp/manila,NetApp/manila,redhat-openstack/manila,openstack/manila,bswartz/manila,sajuptpm/manila,sajuptpm/manila,NetApp/manila,jcsp/manila,openstack/manila,redhat-openstack/manila