Merge "[COMMON] Enhance ONAP common-service template - add IPv4/IPv6 support"