added
some changes to upstart lgoic
fixed conflictsg
Merge branch 'master' into CFY-1340-add-amqp-influxdb-consumer-to-stack
Merge pull request #41 from cloudify-cosmo/CFY-1340-add-amqp-influxdb-consumer-to-stack

Cfy 1340 add amqp influxdb consumer to stack