Merge less intrusive formatter to jboss/ide-config/master