TUSCANY-3729: Apply r1023208 changes to 1.x trunk except for deletion of unreleased modules and samples