Fix xpaths, adopt same conventions as for iso19139.anzlic
	Merge remote-tracking branch 'upstream/master'