Merge pull request #259 from eric-wu/develop

One more fix on the CHANGES table for PLFM-1627 
Merge pull request #260 from eric-wu/develop

Disable the load test that detects deadlocks