ROOMS-201: Support for variables in Rooms
ROOMS-201: Remove variable definitions from rooms_booking_manager
ROOMS-201: Add enquiry form message variable
ROOMS-201: Add Variable as a dependency to Rooms UI
ROOMS-201: Add Variable admin form support
ROOMS-201: Delete the Rooms Terminology module. Work done by Rooms UI now
Switched the default cart expiration time to just 30 minutes, rather than 2 days.
Cleaning up conflict