cherry-pick from master

- Update to 2.7.3 due a vulnerability that affect all versions 2.x. [1]
- Update MASTER_SITES.
- Convert to optionsNG.
- Trim header.

More info:
https://github.com/SpiderLabs/ModSecurity/blob/master/CHANGES

Reported by:    olli hauer <ohauer@gmx.de> [1]
Approved by:    portmgr (bdrewery)
Security:       2070c79a-8e1e-11e2-b34d-000c2957946c

Conflicts:
	security/vuxml/vuln.xml
Merge pull request #76 from reallyenglish/tomoyukis

cherry-pick from master
introduce conf_d, required by beaver
databases/py-redis: Update to 2.7.4

- Allow OPTIONSFILE to be overridden
- Add regression-test: target

Changes: https://github.com/andymccurdy/redis-py/blob/2.7.4/CHANGES

Approved by:	eadler, rm (mentors, implicit)
databases/py-redis: Update to 2.7.6

- Update to 2.7.6
- Update setup.py patch

Changes:

* 2.7.6
    * Added CONFIG RESETSTAT command. Thanks Yossi Gottlieb.
    * Fixed a bug introduced in 2.7.3 that caused issues with script objects
      and pipelines. Thanks Carpentier Pierre-Francois.
    * Converted redis-py's test suite to use the awesome py.test library.
    * Fixed a bug introduced in 2.7.5 that prevented a ConnectionError from
      being raised when the Redis server is LOADING data.
    * Added a BusyLoadingError exception that's raised when the Redis server
      is starting up and not accepting commands yet. BusyLoadingError
      subclasses ConnectionError, which this state previously returned.
      Thanks Yossi Gottlieb.
* 2.7.5
    * DEL, HDEL and ZREM commands now return the numbers of keys deleted
      instead of just True/False.
    * from_url now supports URIs with a port number. Thanks Aaron Westendorf.
introduce py-glob2, required by beaver
introduce beaver
sort plist
Merge pull request #77 from reallyenglish/tomoyukis

introduce beaver, logshipper for logstash
rename the port directory to match PORTNAME
Merge pull request #78 from reallyenglish/tomoyukis

rename the port directory to match PORTNAME
introduce new user for beaver

it looks like new user is added to 9xx. wish 7xx will not collide.
PORT_OPTIONS'fy

ZEROMQ is what i'm going to try
Merge pull request #79 from reallyenglish/tomoyukis

create a uniq user and PORT_OPTIONS'fy
connect py-Beaver to INDEX build
Merge pull request #80 from reallyenglish/tomoyukis

connect py-Beaver to INDEX build
bugfix: missing dependency on sqlite3
Merge pull request #81 from reallyenglish/tomoyukis

bugfix: missing dependency on sqlite3
USE_RC_SUBR
Merge pull request #82 from reallyenglish/tomoyukis

USE_RC_SUBR