alpine 2.11

Merges Alpine-chappa into Alpine, following Debian & Ubuntu’s lead and adds my patch for the Yosemite build failure.

Closes #33634.
Ah thanks, I wasn't sure how it would handle the merge. I'll pull the revision out.