ACCUMULO-970 roll back 1.5.0-RC2

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1480864 13f79535-47bb-0310-9956-ffa450edef68