Merge "Fix javadoc link in SubscriptionManager"