@evoskuil: Sorry, I am a little confused about your comment. I hope you mean "GENERATED SOURCE CODE, DO NOT EDIT...", but I believe inside "Files changed" there don't exist such files or please give me a counterexample.
As @pmienk suggested, a rebase or just checking out master and then cherry-picking the proper commit should take care of it (along with a force push over your light-cleanup branch).