Merge "Fix @link tags in keystore doc" into nyc-docs