This will make further updates easier, as we won't have to patch
previous versions by hand like we just did.

This will make the output more readable, at the cost of making the
directives slightly less readable.

otherwise we show the old kernel that's about to be removed anyway.

We don't want to institute a policy of having etckeeper everywhere,
it's a giant change that will have impact beyond just silencing this
warning.

This reverts commit 9a1c6136.

clean_conflicts needs etckeeper to run, but it might not be installed

semicolon causes an error on the shell

this keeps the previous manual instructions for future reference, mainly
in case surprises with the new expanded puppet profile

manual bits should probably be removed eventually once puppetization is
proven reliable, to cut down on the level of clutter in here