After you pull in the following commit on develop, please edit your preferences in either Eclipse or IntelliJ to reload etc/eclipseOrganizeImports.importorder in Eclipse or etc/intellijIdeaCodeStyle.xml in IntelliJ.
commit 17a4348f786cea900fea6577485374e88dc45b2e Author: Kirk Lund <kl...@apache.org> Date: Thu Sep 15 13:12:35 2016 -0700 GEODE-37: update formatters to include org.apache.geode Imports of com.gemstone are still in the formatters and will be listed at the very bottom. Next up bottom will be listed org.apache.geode. Thanks, Kirk