Use ulimit for all flavors

- clean old limits
- use ulimit for all flavors
Add `fi` that was mistakenly dropped during edit
Make modification to the `/etc/security/limits.conf` file opt-in