Merge "BUG-576: fixed javadoc warnings."