Moved Guava workaround into framework (TODO: merge into first commit)
Fixed potential startup race with picketlink init (TODO: merge into first commit)