Add convience macro for common equal-or-throw pattern (#2965)
Rename macro, swap last arguments, in response to review for #2965
Merge branch 'tickets/2965'
Merge remote-tracking branch 'LSST/master'