Eng5591

- Don't add the rejoin heap requirements in when k=0
- Duct-tape all of the junit tests up so that they satisfy the don't-crash threshold (future sadness guaranteed)