I have made the changes you requested except for restoring the 23 patch and I uploaded to the unapproved queue for Ubuntu 17.10.
I have made the changes you requested except for restoring the 23 patch and I uploaded to the unapproved queue for Ubuntu 17.10.