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

Change-Id: If680536484074b473458723d93e783d074d7f669
Merge commit '767350772b93c8dad1a438b67ef04ebab9b7cafe' into cm-10.1