Set 5.8 maintenance branch for marketplace-template-rendering