FACES-2002 rebased

Hi @ngriffin7a,

I rebased from master. After it it's committed, some classes should just to be moved in "internal" subpackage for FACES-2021 (OSGI)