MswRollUp:  Made neighbour calculations handle cells on edge
This is an intermediate commit and does not compile
p4#: 22219