BRANCH 4.1:
  fixed the bug in Checkin Wdg when subcontext options is specified.
  if context option is specified, the Delivery option is disabled.
Merge branch '4.2' of https://github.com/Southpaw-TACTIC/TACTIC into 4.2