These changes look unrelated.  Could you remove them from this pull request or make a new request without them if they are unrelated?