Optimized imports, updated pom.xml for CB 1.5.1-R0.1.