WhiteSource vulnerabilities fix.
Original MRs: !90 (merged), !99 (merged), !101 (merged)
(cherry picked from commit ba663108)
Part of the #31 (closed) series
Original MRs: !90 (merged), !99 (merged), !101 (merged)
(cherry picked from commit ba663108)
Part of the #31 (closed) series