Fix bug 1373264
	Changing supervisor group name port for rabbitmq-server service.
	Fix setup_all_with_images equvialent to setup_all

Change-Id: I505f4a394f0904b100f62ac8a95869804e3d25a9