kill rabbitmq process if any so that supervisor can launch it

Change-Id: I7ae3879c7e2f4c638523e2fc0ae8f35fc704568e
Merge remote-tracking branch 'upstream/master'