Merge "Update sdnc-oam for sdnc and sdnc-web to use frankfurt head version" into...