CLOUDIFY-2603 bug fix
Merge pull request #1 from CloudifySource/feature/CLOUDIFY-2603-neutron-support

CLOUDIFY-2603 bug fix