Merge "Fixes OVS NSH build with increased memory" into stable/euphrates