ACCUMULO-1999 Backport changes from 1664 which advertise the Master's random port
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2009 add commons-httpclient as a test dependency
Merge branch '1.6.0-SNAPSHOT' of http://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT