Properly use JUST_MACHINE_SUFFIX when desired; always make path the same as find_a_file will use. From-SVN: r3065