Remove the const cast in TH1::GetAxis(). Add a "const TAxis * GetAxis() const" method  and a non const   "TAxis * GetAxis()" method. This fixes ROOT-6361