1.8.4 release
Release candidate 2
Bump RPM release number
Updates for final 1.8.4.release
Merge branch 'master' into ubuntu