Merge "Update docker-compose for configurable certs"