[BUGFIX] Improve finding of the current Storage

Change-Id: I28fa9a0e8ecad210c0b04fca4b24a09b3e7aaf0a
Releases: 3.1
Resolves: #61603
Reviewed-on: http://review.typo3.org/32790
Reviewed-by: Fabien Udriot <fabien.udriot@ecodev.ch>
Tested-by: Fabien Udriot <fabien.udriot@ecodev.ch>