Clean up configuration of ForwardFieldSvc and related tools
This merge request tidies up the configuration of tools and services which use the ForwardFieldSvc. Follows on from !34892 (merged). There will be another round of tidying when the ForwardFieldSvc is replaced by a conditions object.