BIGTOP-1103. Remaining fixes of BIGTOP_DEFAULT_DIR evaluation