CONN-1400: Bounded XML occurrences
Merge pull request #934 from christophermay07/CONN-1400

CONN-1400