update to base 2.0.21 and SUSYTools branch head