Bug 2183: ClassCastException in AbstractTypeMemberBuilder fix

Change-Id: I0d5a21653f958c630c2a573b9cb90af28e59a627
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
Merge "Bug 2183: ClassCastException in AbstractTypeMemberBuilder fix"