Active branches rebased

[Andi Huber]

Hi folks,

I've again re-based '2.0.0-M2' on top of today's 'master' (=2.0.0-M1)
and branch 'ISIS-1779-jax-rs-2' re-based on top of '2.0.0-M2'.

Cheers, Andi!