Fixed #18731 : Added a --extra-keyword option to the makemessages commmand

Hello, here's the patch reworked for integration in the 1.7 release.

ticket: https://code.djangoproject.com/ticket/18731