merge "test-john" into "master"

SR scripts v2.0
changes include
disk/tape separation
inclusion of new metrics
correction of scripts
improvement of algorithms
run_local options
.conf files for quick corrections and options