Since the changes are splattered over several commits already
taken apart by other cherry-picks, just sync the files that
have not had their changes moved to stable/16.7 yet.

o Adapt to cipher output changes in OpenVPN 2.1.12
o Improve plugin probing for virtual interface
o Added missing IPv6 Tunnel Network for CSC