Starting release 1.6; rev develop branch to 1.7
Merge branch 'release/1.6' into develop
Implement a "this_host" context manager.
Use provided hostname
Merge branch 'feature/CI-278' into develop
Update changes
Merge branch 'release/1.7'