Fixes #5999 - vpc + pub ip -> attach pub ip
fixes #5841 - use inner query when retrieving reports for subset of authorised hosts
fixes #8228 - add a config_templates concern to serve config_templates controllers
Merge remote branch 'origin/develop' into develop