Re #7657. Correct indentation: tabs -> spaces.
Re #7657. Make tests pass when APITest executable is run directly.
Merge branch 'feature/7657_jenkins_valgrind_job' into develop