Tiger Woods to make PGA Tour return alongside Thomas and Woodland at Riviera