DDF-335: Branching off Admin Ui code
DDF-431 Resolved CRLF issue in ConfiguredService.java