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)