Merge "xci: Adjust how bifrost inventory files are specified"