Change to use sets of sync flags instead of enum set

Change-Id: I59cf4d3e8eabb8f2169e055da4a86d562fce9bda
Fix problem where committed local changes are not pushed

Change-Id: Ib0ac93918c10f323771c7054aa636afbc7994f65