Merge changes Ie28ff622,I0179b42e

* changes:
  init: accept -1 or 'unlimited' for an infinite rlimit
  Fix two ParseInt edge cases