Include further dq stuff in mcp and anzlic editor configs
Simplify DQ section in template
Merge remote-tracking branch 'upstream/master'