Error code changes.
Merge branch 'master' of https://github.com/BandwidthOnDemand/nsi-pce

Conflicts:
	config/dds.xml