Merge "Add Contrail UID/GID to docker-compose"