ACCUMULO-1704 Adding an IteratorSetting(int, String, Class, Map)
    constructor.
ACCUMULO-1706 check for error on sysout

Checking for error conditions inside of loops that use sysout in PrintInfo and FindOfflineTablets.
ACCUMULO-1419 Update README, confs and poms to switch default hadoop
dependency to 2.2.0.

Document the change in default Apache Hadoop dependency. Update
configurations to account for new HADOOP_CONF_DIR and hadoop-2 classpath
entries. Rename profiles from hadoop-1.0 to hadoop-1.2 and hadoop-2.0 to
hadoop-2.2, along with updated dependencies for the hadoop-2.2 profile.
ACCUMULO-1819 Update Makefile for native map to build on new OSX version
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	server/src/main/c++/nativeMap/Makefile
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1819 Screwed up the merge conflict
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1814 Fixes WALog reading issue from 1.5

WALogs from 1.5.0 use a slightly different format than WALogs
from 1.6.0.  Consequently, the code to read WALogs from 1.6.0
doesn't work on files from 1.5.0.  I made changes to
DFSLogger to correctly interpret 1.5.0 based log files,
and increments the log version number to 3, so that
the WALog reading code can correctly identify what type of
file we're dealing with.

This may still require more testing especially with encryption
turned on but for now this will do.

Signed-off-by: Eric Newton <eric.newton@gmail.com>
ACCUMULO-1587 add 'print to file' for grep
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
ACCUMULO-1042 use jline 2.11 for ctrl-c
ACCUMULO-1819 fix warning about useless assignment