Apply patches to obsolete code per issue #6336
Bump version to 1_11_15
Merge branch 'cdcvs/master'

Pull in upstream changes including:

- Fixes for Redmine issue #6336
- Version bumps