Address ISLANDORA-1045

Yeah, @willtp87 mentioned that all the changes in this ticket should under some thorough QA. So, maybe the DGI folks would be willing to throw it through their process if time permits? This definitely won't be part of the 7.x-1.4 release since this is an improvement ticket, so at least we don't have to worry about that. We can put all this work on the back burner until after the release is out if need be. :smile: