This reverts commit 24fd045f68. This commit is causing an installation failure. It appears that it has changed the location of some puppet manifests. Change-Id: Ic9e2a7638f9b87199417016c4d50d84c6534aa88
24fd045f68