Merge branch '2.5-testing' into 2.5-dev
Automatic commit of package [pulp-rpm] release [2.5.0-0.15.rc].
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'