Merge support for enabling / disabling renegotiation support at compile-time