batman-adv: Add fixes from upcoming 2016.2 release