Merge "[noha] Fix gtw private NIC name in j2 templates"