BUG-1687, BUG-1689 FIx belongs-to resolution in dependency resolver

Change-Id: Ie4461b123394b2b8f0cd574c623adcfdf533ec5f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Merge "BUG-1687, BUG-1689 FIx belongs-to resolution in dependency resolver"