Remove class variable now provided by parent class.
Merge branch 'develop' into feature/spring-3.2

* develop:
  Remove class variable now provided by parent class.