CLOUDIFY-2103 fixed phase4 dsl with dsl changes
CLOUDIFY-2107 change type/template workflows to be inline.