Fix null pointer errors.
Move DAO cal to the ServiceElementDiscoveryManager
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	server/src/main/java/edu/harvard/integer/service/discovery/snmp/DiscoverCdpTopologyTask.java