fix for multibox with same cloud service name
Fix merge conflicts.
Merge branch 'devigned-fix/multibox'