[branding] correct getMachineBrand and getMachineName imports.
openvix: build 842
Merge branch 'master'