Merge r1002085 Add explicit ${basedir} references to ensure paths are correct when running from a top-level build