Patch Set 2: Looks good to me, approved; IP review completed

rebased to current HEAD

We put bug ids in the footer.

We prefer to have the reasoning of why a change is necessary in the commit message so that understanding commits doesn't need a lookup of bugzilla entries.