RF-13609: Fixed broken import statements
RF-13609: Resolved class discrepencies in the faces-config files