Merge branch 'net-dsa-lantiq_gswip-two-fixes-for-net-stable'