Update OU Qtype varnumunit for simplified forms #6860

Completed. Ready for merge. Check feature for details