CFY-606 fix includes update
Merge pull request #96 from cloudify-cosmo/feature/CFY-606-final-fixes

CFY-606 fix includes update