Merge pull request #14 from mancdaz/master

Merged automatically by jenkins after successful build test
Merge pull request #15 from mancdaz/master

Merged automatically by jenkins after successful build test
get services right to account for renaming in nova cookbook