stages.pp puppet lint fixes

Change-Id: Ibf95564069628395a993b40a95a01b93dff81b8a
Merge "stages.pp puppet lint fixes" into production