IntelliJ Project files want to update themselves
PRD-4898 - Trying to fix a class-cast-exception I cannot trace.
Merge pull request #337 from tmorgner/PRD-4898-5.0-v3

Prd 4898 into 5.0.5