Merge "Allow to run swift and keystone api tests standalone"