Merge "Fix broken api links in lib/services"