Inline INT_* constants

The constants had no semantics associated with them except the integer
they represented.
Clean conref push Java code
Merge branch 'develop' of github.com:dita-ot/dita-ot into develop