Topic merge lwrp

Merge in foodcritic fixes and change from using definitions to lwrp