Add User Properties / Expressions for failBuildInCaseOfConflict and defaultStrategy