More cleanup of conflict messages
Align params stanza
Cleanup to install.pp