I don't see any way the junior prefs get back dividends. That is cash directly out of the government's pocket and I can't seem them agreeing to any deal involving a cash outflow.
If the junior prefs are to get a sweetened deal it will be in the form of a (voluntary) conversion to common at a favorable ratio.