Fix manual merge which duplicated Notes related list
Merge branch 'feature/template-layouts' of github.com:SalesforceFoundation/Cumulus into feature/template-layouts