FACES-2002 Prepare for OSGI (FACES-2021)