We cleaned up unused code in commit:
https://review.openstack.org/#/c/399969/
and accidently added it in https://review.openstack.org/#/c/413237/.
That fix for resource ordering was useful for puppet 3, but
as now we are running tests against puppet 4, this code becomes useless.
This reverts commit 4cf2b7f2f8.
Change-Id: I892cbc3b6957f54dae12bd133911df38937e367a