bottle: fix default Cellar output.
bottle: fix merging .rb files.
qt5 5.1.1

Closes #22756.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
qt5: update bottles.