IDE-1236.  Change inner class member shadowing rules so that inherited members shadow nesting members (was erroneously the other way around http://cdn.mlkshk.com/r/T4W)
Merge remote-tracking branch 'origin/spec' into spec