[broadcom-wl/el7] (15 commits) ...Merge branch 'master' into el7