Merge pull request #363 from jaymzh/lsblk-7

[ohai 7] Linux::filesystems should prefer lsblk to blkid when available
Conflicts:
	CHANGELOG.md