Bug 1096610: stub out puppet::atboot; r=markco
Merge default -> production