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

PRD-4898 for 5.0 - Trying a fix