This commit extends the bootstrap macro management to also consider the case where image was already bootstrap. Note this is a common case for building derived container images and also the situation when `--allow-existing-root` flag is in use.