Ensure we don't care whether PRODUCT_DIR symlinks are expanded
Merge branch 'tickets/DM-1492'