Merge ACME fixes
authorToke Høiland-Jørgensen <toke@toke.dk>
Fri, 8 Feb 2019 16:18:24 +0000 (17:18 +0100)
committerToke Høiland-Jørgensen <toke@toke.dk>
Fri, 8 Feb 2019 16:18:28 +0000 (17:18 +0100)
Closes #8149

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

Trivial merge