CFY-606 use env extra to not override existing startup env
Merge pull request #91 from cloudify-cosmo/feature/CFY-606-final-fixes

CFY-606 use env extra to not override existing startup env