trigger a rebuild of 8.1.5 by removing some dead code
===VersionHistory:None===
minor 8.1.5 version history item edits for two tickets: #4260 and #4256
Merge branch 'V8_1_5-branch'