ACCUMULO-118 merge trunk into sandbox

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/ACCUMULO-118@1490337 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-118 handle different uris

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/ACCUMULO-118@1490338 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-118 add apache license header to new files

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