MFH: r371616

- Fix build for SMYRNA option

Approved by:	portmgr
MFH: r371617

- Add workaround for clang bug, seems like it's unlikely to be fixed before 10.1-RELEASE

Approved by:	portmgr