Refs #969 - Foreman-side changes for serving templates from the proxy
Merge remote branch 'origin/develop' into develop