ACCUMULO-1775 Applying patch from Jessica Seastrom to ignore errors when trying to remove a test directory
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/auto/simple/zooCacheTest.py

ACCUMULO-1775