Also match config volumes for /var/lib/config-data/puppet-generated/
Also match config volumes for /var/lib/config-data/puppet-generated/

Some services only mount this directory, not /var/lib/config-data/$service
so handle this case in the docker-puppet code that maps the mounted
volumes to the services when adding the config hash to the container
environment.

Change-Id: I3bdb7609f322458584ac9597ffbfefb057b84646
Closes-Bug: #1720208

openstack/tripleo-heat-templates,dprince/tripleo-heat-templates,openstack/tripleo-heat-templates,dprince/tripleo-heat-templates