ACCUMULO-2514 switch over to log4j where it makes sense
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT