[18.09] Remove the arch in the image tag Upstream-commit: 4246e237d47800b5a13904acbc789fd4555885b0 Component: packaging