Diff looks good; the TB devs will want the commit message to start with "Bug 23166".
Ideally, yes, as having a coherent format makes it easier to track down things one is looking for. Please use that the next time. However, as long as there is some ticket number available in the commit message that kind of works as well. Thus, I applied the patch to master and maint-7.0 (commits fc2449fc0ef8bebfeaaa1a44c23215a86f64d75a and a0aace68fe848963408de4af7b1c659f2f446fc2).