CLOUDIFY-1976
- Fix NPE when deploying a dsl with no plugins
- Add support --dsl which points to a directory containing the dsl file.
CLOUDIFY-1976
Change the dsl in the noplugin test to be more simple
Merge pull request #43 from CloudifySource/feature/CLOUDIFY-1976-NullPointer-deploy-dsl-wrong-structure

CLOUDIFY-1976
Merge branch 'develop' into feature/CLOUDIFY-1944-relationships