Fix Various System Plugins Coding Style
Merge pull request #1062 from loicloic/master

Fix Various System Plugins Coding Style