update regression test to search for contrib sql files (postgis, hstore, spatial_ref_sys) in the event that creating these extension fails. previously this was hardcoded for postgis bits to debian like system. for hstore it used to just fail outright
fix merge conflict