CFY-1363 minor refactor. dont define a shared constrcutor for the operation merger
CFY-1363 some more refactoring
CFY-1363 fix parsing format tests
CFY-1363 fix tests
CFY-1363 fix flake
CFY-1363 fix tests
CFY-1363 fix tests
Merge branch 'master' into CFY-1363-executor-override

Conflicts:
	dsl_parser/interfaces/utils.py
	dsl_parser/parser.py
	dsl_parser/tests/test_parser_api.py
CFY-1363 set operation executor
CFY-1363 fix tests
CFY-1363 inputs are now not required in node template operation, to allow for easy executor override
CFY-1363 added test for node template operations that do not declare inputs
CFY-1363 fix for python2.6
CFY-1363 fix for python2.6
CFY-1363 no need to add plugins from relationship operations, these are already included as node operations if necessary
Merge pull request #36 from cloudify-cosmo/CFY-1363-executor-override

Cfy 1363 executor override