fix for broken mergeWebXml functionality
Merge branch 'master' into v1.29
cut RC2