Fix issues for suse
Fix suse distro class init
Merge remote-tracking branch 'private/2.1' into 2.1