CATS-900 GRN from FDP resolved
Resolved webconfig file pull conflict to push
Fixed some build errors