Some changes to ServerMetadata and its tests
Created DataValueSet.xsd, .xml and modified api/pom and JaxbObjects to
use the xsd.
Added missing getOption[Set?]ByUid to service/dao
Not sure where all the omod lib stuff came from, hopefully won't cause
problems
Merging changes from 16 Sep RF