patch 2 small merging mistakes in OpenVPN