missing end in addresses function
Merge branch 'deltacloud-core-dev' into github-upstream-master
Merge cleanup
Merge branch 'master' of https://github.com/cybercom-cloud/deltacloud-core