Merge branch 'master' of ssh://git.fedorahosted.org/git/ovirt/node-image