added changes that resolve connection problem between remote and local containers
Merge branch 'master' of https://github.com/hydroshare/hydroshare

Need to push some new changes related to RHESSys model run within HS and have to do the merge before I can push.