The suggested fix here is likely better than the one I did for SLE 12, which was just to disable the whole git commit that created this bug. See boo#898233