ACCUMULO-2948 Use an AtomicInteger to any worry from multiple threads access pdCount concurrently.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
Merge branch '1.6.1-SNAPSHOT'