Also fix a typo. Change-Id: Ie5e986eae3fb4b5c26889e4ebba194cf0fd4fd50
If we move these into a subdir, it cleans up the number of things we nave to files match on. Stop running disable-puppet-agent in base. We run it in run-puppet which should be fine. Change-Id: Ia16adb96b11d25a097490882c4c59a50a0b7b23d