BZ1055632 - Incremental build may fail with ConcurrentModificationException
(cherry picked from commit 4a89af63351c0131a52788d8d6c6e4cd0a471def)