Remove some remaining old options references.

Testing Done:
CI passed. Manual testing of cmd-line flags.

Reviewed at https://rbcommons.com/s/twitter/r/1317/
Sync of https://github.com/pantsbuild/pants/commit/53f3b88d7d18dad7f353eaeea273dec16b5846b0