BUG-731: do not do String.toString()

Fixes a sonar warning. Also adds missing copyright headers.

Change-Id: If16eebc39e7f0d7e9787529995b666f04d239cdf
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-731: do not do String.toString()"