Merge "Have docker start script honor configuration"