ACCUMULO-2826 Allow single CF for IntersectingIterator
Merge remote-tracking branch 'ryanleary/ACCUMULO-2826' into 1.6
Merge branch '1.6'
ACCUMULO-3182 Fix javadoc (link to non-visible member)
Merge branch '1.6'
ACCUMULO-3197 Remove deprecated items from Instance

  Partially addresses ACCUMULO-3199 by removing the getConfiguration() method
  from Instance, which is prone to misuse.
ACCUMULO-3197 Remove deprecated code