Add workaround for nested server dependencies.

@bug W-xxxxxx@

@rev eric.anderson@
Merging origin/goliver/master-pending-cscc-workaround into master