Modified overlay.xml
Added branch definition
Fixed use flags.
Rollback git branch in overlay.xml