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