#230 

RtDeployKeysTest.java:121-125: RtDeployKeys should be able to...

PS:  some conflicts may have to be solved.