remove backdoor hack to test claim swapping without a schedd #4280
===VersionHistory:None===
Merge branch 'V8_1_6-branch'