remove RABBIT-MQ config lines if it's possible.

This lines affects deployment configurations, thah not using Rabbit-MQ (ex:Qpid)
Merge branch 'develop' into cs_rabbitmq