Patches for Fix option handling for check_http [sf#1657280] [#766]