Update benchmark code to be more robust, and fix bug in logout procedure.
Merge pull request #983 from bcipolli/update_benchmark_base

Update benchmark code to be more robust, and fix bug in logout procedure