TRUNK-3586 Added javadocs