fixing VPC for 3.1m5
Merge branch '3.1m5' of github.com:schubergphilis/cloudify-cloudstack-plugin into 3.1m5