Revert "Remove compat-wireless and use 3.16-1 branch for backports"

This reverts commit 10936b3455d510a49fafc9abfb19e7de97b348b8.

backports-3.16-1 not ready for tests yet