Merge changes I81537658,I653a2ed5,I1aa94f93,I500b4755,I0c379ae2

Merge changes I81537658,I653a2ed5,I1aa94f93,I500b4755,I0c379ae2

* changes:
  sonar security issue fix- Make sure that using a regular expression is safe here
  sonar security issue fix- Make sure that environment variables are used safely here
  sonar vulnerability issue fix- Do something with the "boolean" value returned by "delete"; Enable server certificate validation on this SSL/TLS connection
  sonar bug fix- conditional operation returns the same value whether the condition is "true" or "false"
  sonar bug fix- Use the "equals" method if value comparison was intended