JBIDE-18365 - newest facets and module version support, ee7

Remember to apply to master AND BRANCH