Backport puppet fixes from branch to tarball

We need to deliver puppet fixes for old releases, since it's very
important for openstack patching - without it a rollback will not
work.

The backported fixes are located under the same directories as on
master node. The fuel_upgrade script can deal with it since the
patch:

    https://review.openstack.org/#/c/113315/

Change-Id: I4643e237b595349041c6ada5be1d8be7967f13fc
Partial-Bug: #1352896