SECURITY-802 Tag PicketBox 4.0.21.Beta1
Merge tag '4.0.21.Beta1'

Tag: 4.0.21.Beta1 sha1: fced3d2e37c9e31f7d65513fbe5a37c2fedd2aaa using 'Stefan Guilhen', 'sguilhen@redhat.com' on 'Mon Feb 24 18:11:34 2014 +0000'