Merge "Code clean-up of CLI test "cinder list-extensions""