Merge "Put keystore into the drmrpc group"