Merge "Switch logrotate->build-discarder for integration templates"