up-to-date changes for next version

[ci skip]
Using dokku-docker-options

[ci skip]
two more tests for web.init
CLI tests