Updating system props to accommodate for new Java nuances

(cherry picked from commit 2f44c964f858092f2cadbf3ccf6e5046a2ca037e)