- Use a different encoding for lockmgr options: make them encoded by

- Use a different encoding for lockmgr options: make them encoded by
  bit in order to allow per-bit checks on the options flag, in particular
  in the consumers code [1]
- Re-enable the check against TDP_DEADLKTREAT as the anti-waiters
  starvation patch allows exclusive waiters to override new shared
  requests.

[1] Requested by:	pjd, jeff