Import addon repos correctly with most recent RHEL7 nightlies

Bug: 1013414
Change-Id: I23e0449ed7473316cf32909458155d7ffa3bb44a