Merge branch 'query-timeout'
Merge pull request #75 from atlasapi/mbst-5505-nine-ex

MBST-5505 now/next
Fix tests
Fixes for hamcrest upgrade
Merge branch 'master' into stage