Merge "Fix order of arguments in assertEqual"

diff --cc cinder/tests/unit/api/contrib/test_volume_unmanage.py
Simple merge

diff --cc cinder/tests/unit/api/test_common.py
Simple merge

diff --cc cinder/tests/unit/keymgr/test_barbican.py
Simple merge

diff --cc cinder/tests/unit/test_backup.py
Simple merge