Fixing local dependencies computation for super components. @rev byao@ @bug W-2257252@
Merging origin/dmcmillen/master-pending-hasServerDeps into master