Merge changes I04517ee2,I476792ca

* changes:
  ART: Remove unused lock levels
  ART: Clean up old mutex