Add roles for PE 2.8.7 master and agents