Additional detection for OpenVZ systems.

Refs #11877

Conflicts:
	salt/grains/core.py
Typo
Pylint
Merge pull request #12543 from cachedout/11877

11877