correct docker settings inside docker/conf
merge upstream changes