refactored search engine, used list to make it more deterministic
Merge branch 'release-3.1.0' into develop
Forced regression scripts to use python 3
Merge remote-tracking branch 'upstream/develop' into call_log_locations