Merge "Search another path for etc/tempest"