Partially solving LPS-40468

Hi Ryan,
Speeding up the solution of LPS-40468, you'll find my contribution attached.
Since this is my first liferay commit through Git please bear with me if anything goes wrong.
Regarding the other Plugins i will have to find some time for it.

Regards,
Corné