+ fix wrong merge from jdt.core
+ disambiguate CodeFormatter constants
3 files changed