1150297 - Update versions from 2.4.x to 2.5.0.

https://bugzilla.redhat.com/show_bug.cgi?id=1150297
Merge branch '1150297' into 2.5-testing