Better search enablement handling in contact tests. (justinvdm, Hodgestar)
Merge branch 'develop' into feature/issue-237-travis-builds