[TIDOC-1732] Update for BlackBerry changes
Merge pull request #5818 from bhatfield/tidoc-1732-3_3_X

[TIDOC-1732] Update for BlackBerry changes