Idea 9.0.3 on OS X Snow Leopard - resetting locations for JDK, Maven?

I am having a problem with 9.0.3 and preference resets.

I am using Maven 2.2.1 and JDK 1.6, and when opening a project via the Maven POM, I always get an incorrect (old) setting for the Maven home.

Idea complains when I attempt to run Maven because it says that the environment variable M2_HOME is not set, although it is set in my .profile locally, and in the .MacOSX/environment.plist as well.  If I pick "override" and pick a particular maven install, it works.  But I have to do that for every client.

I saw a problem in my configuration where it was pointing to an old version, so I removed that value from the settings XML file.  That didn't work.

Any ideas on why this could be?

Thanks,

Ken