Start up time of BoD is fixed, hence final
Fix caching of NSA discovery and NSI topology

Both discovery and topology now use the version of the cached document
to compare for updates.

Also possible threading issues are fixed.

Conflicts:
	src/main/java/nl/surfnet/bod/service/NsiInfraDocumentsService.java
Improve mismatch description of isPresent matcher
Dynamically set vlanId presentation for OneControl

The UniCeVlanIdPreservation parameter for OneControl strictly defined
whether or not the NMS must translate the given VLANs. The parameter is
set to preserve when BoD VLAN translation is disabled or if the source
and destination ports use the same VLAN.
Rename test class for NsiInfraDocumentsService
Add switching service to topology.

This required an update of the nmlbase schema to an unofficial version
used by the PCE (see BOD-NSI) and the addition of the nsi-service-definition
schema.
Merge feature 'SwitchingService in topology'