Port integration test speed and stability fixes from integration/1.2 - #1824

Port integration test speed and stability fixes from integration/1.2#1824

kevinherron merged 2 commits into

maineclipse-milo/milo:mainfrom

t3code/port-integration-test-fixeseclipse-milo/milo:t3code/port-integration-test-fixesCopy head branch name to clipboard