Merge pull request #1670 from opheliaKyouko/rdma_fix

Fix a null deref in Controller::EndRPC