Various fixes for repoupdating the correct branch

- Logic error in if [ -z ]
- Added branch names where needed from REPOCONF

Change-Id: Ib65987cfb98dfce1f0c1e0f76ba09589c200917d