Repoman fixes, added metadata.xml and synced to upstream rev 1.71