JBIDE-13926 reorder, add in missing org.jboss.tools.maven.apt.feature, and refactor so more consistent w/ JBDS version >> master