S33246/Bug 1114169 Use regular expressions when specifying datastores