Merged cookbooks from vpc branch
Merge branch 'feature/systemvm-persistent-config' of github.com:schubergphilis/cloudstack into feature/systemvm-persistent-config
Merge branch 'feature/systemvm-persistent-config' of github.com:schubergphilis/cloudstack into feature/systemvm-persistent-config