Merge branch 'daley', remote-tracking branch 'origin'
Get service ports from correct context
Merge branch 'master', remote-tracking branch 'origin' into daley