Bug 23801. Adjust for new pbcpp checkin.
Fix 24430.  Re-ran broken job from command line and it completed.
Merge branch 'mainline'