Eng6098

The main content here and in the corresponding pro pull is to fix a defect where multiple concurrent catalog updates would cause catalog updates to fail in horrible ways.