Merge "Add option to not skip git.properties"