Merge "sql: add buildset.branch column"