Merge "ves blueprint update for port mapping"