Fixes master release notes to be the generic for version after 2.5
Merge branch 'master' into bmbouter-update-master-release-notes-to-be-generic

Conflicts:
	docs/sphinx/user-guide/release-notes/2.5.x.rst
Merge pull request #1146 from pulp/bmbouter-update-master-release-notes-to-be-generic

Fixes master release notes to be the generic for version after 2.5