keep the shelf when we fall back to RoW feed (bug 1068917)

Changed the ES query to do a ```should``` on the RoW region + the original request region.