CLOUDIFY-1981 fix checkstyle
Merge branch 'feature/CLOUDIFY-1972-ruote-events' into feature/CLOUDIFY-1981-riemann-events
CLOUDIFY-1980
If plugin url contains ${plugin_repository} replace it with plugin repository url
Currently hard coded port of the embedded jetty file server of the management machine
CLOUDIFY-1981 added spring core to orchestrator dependencies, for place holder resolving
CLOUDIFY-1981 do not filter riemann reload or celery restart in case of failure. and add stacktrace to error
CLOUDIFY-1981 added property place holder resolving to riemann event logger
CLOUDIFY-1981 remove messages for rules for now
CLOUDIFY-1981 added message to rule and policy types, modified object mapping
CLOUDIFY-1981 added test for reimann place holder resolver
CLOUDIFY-1981 added policy/rule message to riemann event description
CLOUDIFY-1981 use subworkflow name to expose the actual workflow
CLOUDIFY-1981 fixed riemann event logger configuration to use proper place holder bean name
CLOUDIFY-1981 added support for using rule place holders withing message
CLOUDIFY-1981 use # as a riemann place holder prefix to avoid collisions with $
CLOUDIFY-1981 remove logger full name from output
added test for message override
Revert "added test for message override"

This reverts commit 81861d81923887537cb230c0e3c6c584ec43219c.
CLOUDIFY-1981 do not filter riemann reload or celery restart in case of failure. and add stacktrace to error
Merge branch 'develop' into feature/CLOUDIFY-1980-dynamic-plugin-management-repository-url-injection

Conflicts:
	orchestrator/src/main/resources/celery/app/cosmo/cloudify/tosca/artifacts/plugin/plugin_installer/tasks.py
CLOUDIFY-1981 merge develop and fix conflicts