Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5