Merge "Fix Eclipse Java Formatter settings"