Many fixes for Stage

[Boudewijn Rempt]

On Fri, 2 Oct 2015, Boudewijn Rempt wrote:

>> In addition: why did this commit to calligra/2.8 was never merged to 
> calligra/2.9?
>> http://osdir.com/ml/kde-commits/2014-09/msg00859.html
>> Was I supposed to forwardport my commits rather than relying on a regular 
> git merge?
>
> Hm, I might have missed that. I usually do the cherry-picking and merging,
> but I'm fallible...

It still applied, so I cherry-piced to 2.9 and am building now.

Boudewijn