Fix the class whose id existance we're checking
Merge branch '4.0/admin-class-pagemenu' into 4.0-trunk