Fix broken merge. Aspect.java moved from com.sun.tools.xjc.outline to com.sun.tools.xjc.model

    - new xsom version 20140925