Merge pull request #585 from SaberUK/master+configure-engine-selection

Replace arguments for toggling socketengines  with --socketengine.
Use the preprocessor to check for TCP deferring support.