Adds ability for calibration injection to include preload identifiers
fixed lost connection retry logic
Merge pull request #1727 from wfrench/dsa_lost_connection2

OOIION-1734 Fix Dataset Agent Lost Connection Logic
Release Version 2.1.1
Bump Version to 2.1.2-dev
Adds a configurable timeout to dataset monitor based on global config

Timeouts on the buildbot are a frequent occurrence for the dataset
monitor when we use small static values. This commit updates all
instances of this pattern that I could find and switches it to use a
dynamic configurable parameter through pyon.yml

Right now it uses endpoint.receive.timeout but we may want to use a
different CFG key but at least now the failures on buildbot should be
redeuced in frequency.
Merge pull request #1735 from lukecampbell/fixes-r2

TEST - Adds a configurable timeout to dataset monitor based on global config R2
Merge pull request #1723 from lukecampbell/ooiion1732-r2

OOIION-1732 Adds ability for calibration injection to include preload identifiers R2
Merge pull request #1729 from jamie-cyber1/fix_hatest2

Try to make ha test cleanup more robust
Release Version 2.1.2
Bump Version to 2.1.3-dev
Remove excessive logging
Merge pull request #1747 from jamie-cyber1/fix_debug2

Remove excessive logging
Removes excessive logging from CM
Merge pull request #1750 from lukecampbell/logging-r2

TEST - Removes excessive logging from CM R2
Fix gov test
Phase out deprecated tests
Merge pull request #1752 from jamie-cyber1/fix_gov2

Fix gov test
Fix test_command_errors test
Merge pull request #1758 from jamie-cyber1/fix_agent2

OOIION-1744 Fix test_command_errors test