Description of problem:
Sometimes while FFU from 16.2 to 17.1, keystone fails to start due to missing /var/lib/config-data/puppet-generated/keystone/etc/httpd/conf.modules.d, we copy the directoyr from /var/lib/config-data/keystone/etc/httpd/conf.modules.d to the right location , then it starts and "openstack undercloud upgrade" completes

Version-Release number of selected component (if applicable):
Latest

How reproducible:
3 times so far

Steps to Reproduce:
1. Upgrade from 16.2 -> 17.1
2.
3.

Actual results:
Fails due to keystone not starting and catalog entries can't be updated at the very end

Expected results:
Why's that folder not copied ?

Additional info:
3 different customers so far.