Fixed wrong plugin group id
Merge remote-tracking branch 'origin/r/3.1.x' into r/3.1.x
Removed duplicate http bundle reference