Merge "Misc fix for some error seen during IT and javadoc"