Heart Beat - basic client site
Heart Beat - lazy init on both sites
Extracted servicediscovery-annotations. Still EnableServicePublish to be
xtracted.
LB - magister style code :-)
Merge remote-tracking branch 'origin/master'