dynamically pull in activity status list, refs #7830, refs #7660
Merge branch 'dev' into test