ASACORE-916: Add support for self-join

Change-Id: I5c18510b8cb0d1f75f3186534301e641a6285f23
Signed-off-by: Meggan Ehret <meggan@qeo.org>