Merge "rdbms: turn LoadBalancer waitTimeout default into a class constant"