* commit '0a93d875527c52183080b63a0b19d567856952af': StorageManager: Clean up and generalize storage configuration resources