Fix for incomplete block design / randomized block design during saving / loading
Change retrieval of replication arrangement to be based on TermIDs

Post commit code review : Tiff Go