Dbtuning4

@bendk : I finished running the selenium tests for this branch on jenkins and it is safe to merge into staging.