[broadcom-wl/el7: 15/15] Merge branch 'master' into el7