Merge "BUG-576: fixed possible null pointer dereference in BindingGeneratorImpl"