OPSMN-1586, OPSMN-1587, OPSMN-1588: Added dependency on DE upgrade for OSv1.1 upgrade target. Fixed query engine logic to find first common ancestor of 2 separate forms