BUG-2184 Fix subtree filtering for identity-ref leaves

Change-Id: I7d367c793a461ae26f56ddf611f7e45a723f28fc
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
(cherry picked from commit 37b37e348a362f31e01077753cee1c6bdaa645dc)
Merge "BUG-2184 Fix subtree filtering for identity-ref leaves" into stable/helium