Amend HBASE-12160 Make Surefire's argLine configurable in the command line; Fix merge error
HBASE-8808 Use Jacoco to generate Unit Test coverage reports (Manukranth)
HBASE-12148 Remove TimeRangeTracker as point of contention when many threads writing a Store

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/TimeRangeTracker.java
Merge remote-tracking branch 'remotes/origin/0.98' into 0.98