Update maintenance branch to 4.2.1.Final parent