Bump version for 3.0.4rc1
bump for 3.0.4
Merge branch '3.0.4-releng' into 3.0-trunk