b2a3f7b
Sync with upstream release 2.5 Rebuild with merged PRs. Signed-off-by: Andrei Stepanov <astepano@redhat.com>