Merge "Remove novaclient CLI tests"