roomservice: improved handling of remote repos (thx to cyankang)

Change-Id: Ic5fce9452780821c094949ea08fa824a4742274f