Merge changes Icdb40ee3,I4c239844

* changes:
  Knobs for connectivity experiments.
  Mechanical refactoring to improve job dumping.