1150297 - Update versions from 2.4.x to 2.5.0.

https://bugzilla.redhat.com/show_bug.cgi?id=1150297
1102269 - Added documentation about deprecation of task_type
Fixed wording on deprecation notice for task_type
Merge pull request #1235 from dkliban/2.5-testing

1102269 - Added documentation about deprecation of task_type
Merge branch '1150297' into 2.5-testing
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'