MPS-19808 Deadlock due to update of non-concurrent map.
(cherry picked from commit 555b3e4)
MPS-19809 Restore ordering of test method (test methods were executed in unpredictable order for a year now); guard against incorrect ordering of ProjectTest's build/diff
(cherry picked from commit 6140564)
Fix diff errors revealed with corrected ProjectTest