For ENG-5516, fix CME
Merge pull request #960 from VoltDB/ENG-5516

For ENG-5516, fix CME
Change noprogresstimeout to be 6 minutes (deadlock timeout + 1 min).