Merge post-install fix for Jave setup from zacklb.