Merge HEAD, branches 'gh-pages', 'master' and 'sysinfo-1.0' of https://github.com/Mlnx-GSO/sysinfo-snapshot

Conflicts: