rmlock fixes for witness and trylock.

    * Correct witness checks in rmlock rlock
    * Correctly return the return value from the uhi call for rmlock rlock.