Squashed commit with OpenNI2Driver fixes and improvements