MICA-835: Fixed rebase errors and revert previously commited config for login toboggan