Merge "Remove jjb for repos for amsterdam release"