OPENAM-3470 CR-6948 Fix formatting and improve code quality
Moving more OpenFM into OpenAM-federation