Applied patches for the PlayerInjector. I can't test tho, DSH105 fix the pom please.
Merge remote-tracking branch 'origin/2.x' into 2.x