Merge pull request #982 from ddurnev/master

[RJA-2382][fix]: UI - correct recurrence option is selected
[RJA-2378][fix]: Reschedule workflow execution fixed