Shear Behaviour of Rock Joints Under CNL and CNS Boundary Conditions