[OE3902] line breaks displaying comments
[OE-3907] only return uncancelled bookings in getBookingsForEpisode() api method.
Remove redundant collations
Merge branch 'release/1.5' into develop