I don't know if this is a bug in filestore2 or a bug in upload. I guess as long as you don't have both installed, it's not a bug in either one ;)

On the permissions page, since they both have a permission named "upload files" , checking one checks them both. This is problematic.