[JBIDE-15598] Added support for environment variables
[JBIDE-15598] corrected minor formatting and signature issues