Fixed endless recursion loop when super() called in base class

Closes bug: #1327504

Change-Id: Ie2a9bd383b7062eb7956bb07023faee255f306b5
Merge "Fixed endless recursion loop when super() called in base class"