Fix EBZR_PROJECT naming for unity-settings-daemon and unity-control-center
Merge remote-tracking branch 'origin/master'