Improve bash completion of containers Upstream-commit: f8031148337362ef4946f174695eb1077b4e3b72 Component: engine