Merge "Fix SimpleReadOnlyNovaManageTest.test_flavor_list CLI test"