19633: contrib authority

19633: contrib authority
Merge remote-tracking branch 'origin/19633_contrib_authority' into 19633_contrib_authority
Fixing last details for licenses & config files