[git] Minor format change to make master match stage-merge
Merge branch 'master' into stage-merge
[UI] Change Shell In a Box Call

Change From Hostname to Server IP for broken Hostname resolve
Merge branch 'master' into stage-merge