Fixes #4271: Move r30724 to 1.7.5

---svn-pre-commit-ignore-below---

r30724 [[BR]]
Fix mpijavac: -cp classpath
Fixes #4272: Move r30725 to v1.7 branch (Add missing options and cleanup)

---svn-pre-commit-ignore-below---

r30725 [[BR]]
Add missing options and cleanup the code a bit. Default to by-slot ranking if a non-hardware option isn't given. Thanks to Tetsuya Mishima for the assist.

cmr=v1.7.5:reviewer=ompi-gk1.7