calamari-agent: incorporate overrides

Signed-off-by: Dan Mick <dan.mick@inktank.com>
calamari-restapi: bring up with changes as in other tasks

Signed-off-by: Dan Mick <dan.mick@inktank.com>