FSBasedStore fix for groupId file pattern
Merge remote-tracking branch 'origin/master'