Merge "Read OSA_BRANCH from an env var"