An Improved Analytical Model for the Elastic and Plastic Strain-hardening Shear Behaviour of Fully Grouted Rockbolts