Removing old references to picketlink-cdi

Code formatting + removing old references on scm tag