Rebase + some fixes

Signed-off-by: Tibor Vass <tibor@docker.com>