Explicitly add cosine and inetorgperson schemas on Fedora

Fixes Bug1156651

Change-Id: I957a8cdc562a887b0def7bc07c6bb434ce0a0437
Fix FLAT_INTERFACE not working

add a missing colon

Fiex LP# 1158308

Change-Id: Ia873788fd5dd17be3c2942057168fbfddb32c14f
Merge "Fix FLAT_INTERFACE not working"
Merge "Explicitly add cosine and inetorgperson schemas on Fedora"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp