more hacks to get security working
Merge branch 'shane-picketlink' into picketlink