DDF-664: Added in connection and receive timeouts to sources.
DDF-664: fixed merge error and added null check based on test failure