Maint/1.3.x/cherry pick suse patches

This is just a cherry-pick of the recent SUSE patches to the 1.3.x branch; we're going to need to do a 1.3.x release for SUSE/SLES compatibility.

There were a few minor merge conflicts so I'd love an extra set of eyes.  @haus @MosesMendoza