ACCUMULO-1498 ensure 1.4 branch merges cleanly into 1.5 branch by updating svn metadata

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1490759 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1488 backported to 1.5 branch

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1491796 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1505 - merging Ryan Leary's patch, with modifications to update and remove warnings



git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1491911 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1396 simplify specifying target directories from the maven workspace, for developers; updated example files

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1492911 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1488 fix merge conflicts from 1.5 branch to trunk caused by the addition of the same files to two branches of the tree, without merging history

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