Moved over to using the hint to determine the facility when the instrument name is specified. Refs #3086.