ACCUMULO-1793 updates Hadoop 2 profile to match version used in other dev branches. Includes updating slf4j based on what comes with Hadoop 2.2.0.

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT