Add support for 'conflict' parameter to populate svn --accept arg

Allow setting the subversion behaviour on encountering conflicts to something other than the default (postpone), which is undesirable in many cases.

https://tickets.puppetlabs.com/browse/MODULES-1551