Checkin all metaswitch fixes to date