Lint
Merge branch 'develop' into wtperf-745