We had some cherry picks that pulled in relative inclusions rather than
absolute. We likely had a broken puppet-linter job so it didn't catch
them. Now that the job "works" we need to fix these incusions to be
absolute.
Also squash in switch to stable/train helper.
Change-Id: I4470236bb4bdff5356cfcbe98c9db0c00498ec68