Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2761: Add regex to remove everything after the last slash
Merge ACCUMULO-2761 from branch '1.6.1-SNAPSHOT'
ACCUMULO-2811: Move directory creation to the constructor so that the directory creation is only attempted once. Check that the directory does not exist first.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2818 Create standard keystore for Jetty

  Ensure keystore password is the same as the password for the default key it
  holds. Remove extraneous parameter for truststore generation.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2762 Use more compiler optimizations for 1.5 native lib
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT -sours
ACCUMULO-2762 Use all optimizations by default
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2812 Pass options to compiler for native lib

  Use system default architecture options when compiling, instead of forcing
  -m64. Allow passing additional arguments (USERFLAGS) to specify additional
  compiler options. Set USERFLAGS with the build_native_library.sh's
  command-line arguments.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2821 Add/Update docs for building native lib
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/asciidoc/chapters/administration.txt
ACCUMULO-2816 Ensure LocalWALRecovery looks at WAL.

* changed to use of FileSystem api in test to avoid crc handling.
* added better error message for reading an invalid wal
* fixed v2 vs v3 magic header reading