Merge "Add docker keystone service"