openvpn: cleanup
Merge remote-tracking branch 'upstream/master' into openelec-3.2