renamed test classes for locks to reflect class being tested; added read/write lock test
cleaned up commented code
fixed race condition in waitUtilAvailable... methods
Merge branch 'develop'