Adjust/revert some changes re OOIION-1495.

This is mainly while a more careful review by Maurice/Carlos/Edward is done.  Several "TODO(OOIION-1495)" items added facilitate the review.

https://jira.oceanobservatories.org/tasks/browse/OOIION-1495

BTW, ion.agents.platform.rsn.test.test_rsn_platform_driver:TestRsnPlatformDriver.test completes again OK upon these adjustments.