Merge "Adjust kni gerrit trigger to pick up merges"