Merge pull request #31 from EricWittmann/2.4.x-SSO

fix for https://bugzilla.redhat.com/show_bug.cgi?id=1044082
Merge pull request #32 from EricWittmann/2.4.x-SSO

Changes to support running on Fuse 6.x