Merge "Skip dbsync for contrail"