Merge "fix(versal2): rename console build arg to generic" into integration