Fix Mac OS X stub java workaround
Merge branch 'OHAI-514'

Fixes OHAI-514, https://tickets.opscode.com/browse/OHAI-514