Update default manifest to use all "rdm" branches and add an "upstream" branch