Merge pull request #454 from galstrom21/sprint

Merged automatically by jenkins after successful gate test
fix changelog order
Merge pull request #455 from rackerjoe/RPM

Merged automatically by jenkins after successful gate test