MarineFacilityOrgComputedAttributes (extended/computed), int test

Includes status rollups, aligned devices/models, and some code cleanup.