rc6 was released in mid-Jan - this branch now represents the future rc7
Fixes #3478: Fix the rank_file functionality in v1.7

---svn-pre-commit-ignore-below---

r27908 [[BR]]
Fix rank_file operations. We changed the syntax to use semi-colons between multiple slot assignments so that we could use the comma to separate specific cores, but somehow the flex definitions didn't get updated to accept that character. We also incorrectly zero'd the bitmap between slot assignment sections, and so multiple slot assignments only wound up making the last one in the list.
Fixes #3480: Move r27911 to v1.7 branch

---svn-pre-commit-ignore-below---

r27911 [[BR]]
Good ol' Cray changed the way node/cpu allocation is handled in their latest release of ALPS, and so our allocator is broken. Adjust for the revised method, but preserve the older method for those Cray users who have not updated their system.

cmr:v1.7