Merge remote-tracking branch 'upstream/master' into fix_OOIION-631_use_system_time
initial set of changes for OOIION-631 use_system_time
OOIION-631 get_resource and set_resource adjusted to do appropriate ION system time-NTP conversions
Merge remote-tracking branch 'upstream/master' into fix_OOIION-631_use_system_time
Merge remote-tracking branch 'upstream/master' into fix_OOIION-631_use_system_time
completed adjustments to fix OOIION-631
Merge remote-tracking branch 'upstream/master' into fix_OOIION-631_use_system_time
merge upstream/master and resolve minor conflict in notes.txt
Merge remote-tracking branch 'upstream/master' into fix_OOIION-631_use_system_time
Merge pull request #464 from carueda/fix_OOIION-631_use_system_time

OOIION-631 fixed.