Mostly intellij configs.

Minor changes - some copied from 3.10 - so that it all builds again.