GATEWAY-3180 subtask GATEWAY-3374: adding license header.
GATEWAY-3180 subtask GATEWAY-3374: removed system.out calls in unit tests.
GATEWAY-3180 subtask GATEWAY-3374: updates per codereview comments.