[OEM-258] changes to support showing unscheduled bookings when creating a consent form, and related unit test fixes.
Merge branch 'jira/OEM-258'