rmlock fixes for witness and trylock.

    * Correct witness checks in rmlock rlock
    * Correctly return the return value from the uhi call for rmlock rlock.
Merge pull request #25 from erikarn/adrian_rmlock_fix

rmlock fixes for witness and trylock.