fixed issue with  xpath
Merge branch 'rrc'
synched to RRC: nomisma dump generated by NUDS from XQuery, not Solr
merged object map fixes from egypt
Merge branch 'master' into rrc
merged from master