Update mappings + ontology for extraction of 3.10

Files are reflecting the content of the mappings Wiki as of July 15, 2014