Bump occi gems (4.2.0 stable)
Merge remote-tracking branch 'origin/unstable' into unstable

Conflicts:
	lib/probe/occi/rocci/compute.rb