Do not keep heartbeats in memory
typo
Added healthcheck for onecontrol consumer
Re-subscribe when connection is lost
import...
Remove stale import
Merge branch 'master' of github.com:BandwidthOnDemand/bandwidth-on-demand

Conflicts:
	src/main/java/nl/surfnet/bod/nbi/onecontrol/NotificationConsumerHttp.java