Sync master to feature branch#7128

liulinC merged 45 commits into

xapi-project:feature/ldapsxapi-project/xen-api:feature/ldapsfrom

liulinC:private/linl/syncliulinC/xen-api:private/linl/syncCopy head branch name to clipboard