Bug 733107: Search for reconcile status doesn't work right.
Merge branch 'maint'
Merge remote-tracking branch 'upstream/master'
Lower Boost minimum version to 1.48.0 per user request.
Really make it 1.48 instead of 1.49.
Merge remote-tracking branch 'upstream/master'