Revert "Merge branch 'picketlink_integration'"

This reverts commit b2a031e94e3863f67f894d42ad76d136400d16a9, reversing
changes made to 042041ed12ce76c3d843459ff1c66be987db6fd4.