made bench_test3 less flaky, just have it retry a few times #869
fixing email submission
also rename templates file
fixed sh test
Merge branch 'bugfixes/tokumx-1.4' into releases/tokumx-1.4