Code review: 191210043:  Bug fixes in deployment scripts.