Merge "Update Intellij config to work with new version of Intellij." into mnc-ub-dev