Re-snapshot moira at r4149 (Trac: #1420)

Re-import moira to bring in latest fixes, including the fix for
update_filesys in r4145