LOW: Fixed terminology
Merge branch '1.7' of https://github.com/openflexo-team/openflexo-core.git into 1.7
LOW: update code formatter options + minor fixes
LOW: checkstyle fix
LOW: Code formatting
LOW: Code formatting