Revert "LEDE v18.06.0-rc1: revert to branch defaults"