Fix javadocs a bit

Change-Id: Ib7c43ca661dcfa105f9a41e0ebeecdbb4f05a655
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Fix javadocs a bit"