Added source-formatter.properties to avoid breaking code when formatting source. Fixed changes that were unintentionally reverted due to conflicts.