Add machine-id to the grains
pep8 fixes for grains/core.py
Use cmd.retcode with _linux_bin_exists

instead of cmd.run and echo $?
dash is not allowed in function names

and dictionaries use : instead of , ...
Merge pull request #11339 from gtmanfred/machine-id

Add machine-id to the grains