Add some missing /'s and +'s to fix hieradata pathing
Add some missing /'s and +'s to fix hieradata pathing

These were missed when the puppet4 support was added.

Change-Id: I7f7153093aaf46d5bbdb620228cf1c7fce3650e1

openstack-infra/ansible-puppet,openstack-infra/ansible-puppet