Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
ACCUMULO-2754 Exclude thrift classes from PMD/CPD
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2760 just wait for the tserver to die if the wait was long; timeout means it failed to die
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2765 Convert FrameworkTest to junit4

Use JUnit 4
To enable new features
Don't catch exceptions
Merge branch '1.6.0-SNAPSHOT'