[v6r10] Fix rm and storage

NOTE: still some pylint errors remain in SRM2Storage due to unknown imports,
but this is normal. Error at line 2196 is worrying, but apparently not
problematic ;-)