Glenn: please update your "organize imports" settings to include "org.springframework" separately from "org". The empty line between org.apache and org.springframework is a result of that setting, and your commit removed it. Of course this is a minor thing, and I will revert the line-removal upon merge.