ACCUMULO-1158 reverted changes for newlines w/ following commands:
 svn merge -r HEAD:1453514 .
 svn merge -r 1:HEAD ../accumulo-1.5/ ./

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