CLOUDIFY-2134
upgraded test_parser and parser.py some more
Merge remote-tracking branch 'origin/feature/CLOUDIFY-2134-cosmo-python-dsl-parser' into feature/CLOUDIFY-2134-cosmo-python-dsl-parser

Conflicts:
	dsl_parser/tests/test_parser.py