Merge Stewart - some documentation clean up Merge Patrick - fix bug 693130: Tests depending on archive engine should be skipped if archive isn't enabled Merge Patrick - fix bug 697292: The have_valgrind include file in the test has the opposite effect