Merge "docker: new hybrid deployment architecture and configuration"