ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

Signed-off-by: Sean Busbey <busbey@cloudera.com>
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

-sours merge, 1.5.x specific changes in follow on patch.
ACCUMULO-2005: Add a 3rd argument to functional test RunTests.java to allow a timeout factor for mapred.task.timeout and run.py -f flag

(reimplemented for 1.5.x branch)

Signed-off-by: Sean Busbey <busbey@cloudera.com>
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Delete conflicts; functional tests moved to ITs.

Conflicts:
	test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
	test/system/auto/README
Merge branch '1.6.0-SNAPSHOT'