fix for rabbitmq failing to start in upgrade from R1.10 to R2.0

Change-Id: I80e6a03fce93a3e31dd45228cb8d3a42514d9140
Merge "fix for rabbitmq failing to start in upgrade from R1.10 to R2.0" into R2.0