roomservice: When validating the presence of a repo, check main manifest too

Change-Id: If680536484074b473458723d93e783d074d7f669
Merge remote-tracking branch 'cm/cm-10.1' into HEAD