Changes for supporting automatic merging
Changes for supporting automatic merging

fedora-infra/fedora-college,echevemaster/fedora-college,echevemaster/fedora-college,fedora-infra/fedora-college,fedora-infra/fedora-college,echevemaster/fedora-college,echevemaster/fedora-college,fedora-infra/fedora-college