CA-148495: secure build.
CA-148495: include recent changes.
CA-148495: Merge remote-tracking branch 'creedence/master'.
CA-148495: secure build.

Merge remote-tracking branch 'creedence-sb/master' into sb
Merge pull request #269 from pmw/sb

CA-148495: secure build.