Template changes for ccng support for service gateways

Change-Id: I45e73e051d1b9216cbe926d6bab443eeec95e2e3
Merge "Template changes for ccng support for service gateways"