NXP-12415 - Enhance properties substitution in Java options