Remove circular relationship between sink and sinkServer

Signed-off-by: Glenn Oppegard <goppegard@pivotallabs.com>