Merge branch 'master' of https://github.com/Toure/RHOS-Transmigration into new_structure

Conflicts:
	task/live_migrate.py