Bug 1020002: don't allow an activity choice that could subvert forward-lock

address review comments
Merge pull request #20029 from davidflanagan/bug1020002

Bug 1020002: don't allow an activity choice that could subvert forward-lock