QPID-????: Fixup to previous commit (missed change to message timestamp bool)
QPID-????: Change to hold broker options by ref