BZ-1035259 - Could not find a work item handler for REST, BZ- 1035256 -Could not find a work item handler for WebService

(cherry picked from commit 3aa65069b5b2169603341d5c3cf95a603de4ad1f)