Fix setup file layout

[revati-naik-apex]

The setup file layout has a few additional lines coming from the recent changes (when no patch files are passed in the .repos entries).

1. Fix the extra lines
2. Fix hardcoded ros.repos file name in the setup file