Merge pull request #255 in SW_PON/linux from feature/DRVLIB_SW-540-switchdev_vlan_handling to xrx500

* commit '20aa70e48dd57d306bf278b6491cbc49d3b064d4':
  sqush before rebase