Merge pull request #3309 from rubenk/remove-lvm-plugin