preparation for a 1.5.4 based patch build. This update is to put this _maintenance_patches branch in line with the _maintenance branch, as it existed for the R1_5_4 release.