OPSMN-1478: Prefix form name + extn form name to fields in aggregates and pivot table step