Merge "Fixed bug when getter for YANG leaf named class colided with getClass()"