Removed listen_ssl that will be merged separately

Fixed tests broken by last commit
Merge branch 'master' of github.com:zestrada/puppetlabs-openstack