Merge "Handle upsync of multiple BYDAY values; add some unit tests"