+htp #15933 import + improve SecurityDirectives (+ infrastructure) from spray