MODCLUSTER-338 & MODCLUSTER-337

https://issues.jboss.org/browse/MODCLUSTER-338
https://issues.jboss.org/browse/MODCLUSTER-337

master only -- this requires proxy modules update if security key is not used