Merge in fixes for rpm/instance lookup.