Merge branch 'MDL-68443-xmldb-path-validation' of https://github.com/brendanheywood...