Revert "15.04.1, omit conflicts with kde-i18n, kf5-ki18n"
    
    This reverts commit ab13597a5f1c6250aa361bac5d1df1f345410429.
    
    Reverting the upgrade to 15.04.1 in f22 so we can finally push a fix for the
    showstopper #1219583 without introducing other changes that might not match the
    applications we ship.