adapted the samples to work according to the changes in 514cecce68698be664d45064c34447cee9a1aa51
added svnmerge.py blocked property
narf. deleted svn:svnmerge-blocked property, added svnmerge.py blocked property
fixed svnmerge-integrated property