Merge "Bump swap to 2GB in linuxbridge/openvswitch jobs"