refactoring commit
Update to fix merges, added address resolver for public IPS
Merge branch 'master' of https://github.com/workshare/ms-nos

Conflicts:
	src/main/java/com/workshare/msnos/core/payloads/Presence.java
	src/main/java/com/workshare/msnos/core/protocols/ip/Network.java
	src/test/java/com/workshare/msnos/core/AgentTest.java
	src/test/java/com/workshare/msnos/core/protocols/ip/NetworkTest.java
	src/test/java/com/workshare/msnos/core/protocols/ip/Spike.java
	src/test/java/com/workshare/msnos/usvc/MicroserviceTest.java