am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken

Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'

* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
tree: 7ded637673509593f63b3666b7132183d29ef13e
  1. camera/
  2. cmds/
  3. include/
  4. media/