clean up storage patch
Merge branch 'master' into storage_patch_cleanup

Conflicts:
	patches/storage.patch
Merge pull request #524 from yast/storage_patch_cleanup

clean up storage patch