openvix: build 014
Merge remote-tracking branch 'alliance/2.2' into 2.2

* alliance/2.2:

Conflicts:
	meta-oe/conf/distro/openvix.conf