Merge "ccvpn integration sdnc issue fix" into casablanca