BUG-865: replaced deprecated code from binding-generator-util.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
Merge "BUG-865: replaced deprecated code from binding-generator-util."