More ubuntu fixes

Added the concept of build stages to ensure database is running before
other resources.
Merge branch 'ubuntu_fixes'
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-openstack