back ported template repo and file service updates
back ports packaging service updates
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2