EXOGTN-1872 Fix warnings during maven build
Merge commit '01e4d7376da125b923e15622e446571ddd92899b' into HEAD