Edited ConsentService to not provide as many nullpointerexceptions, edited UserAdminService to increase chances of success for delete, and changed name of ManualCleanup to ManualCleanupTest so that JUnit actually runs it.
merged with upstream changes.
added a comment.
Merge pull request #388 from SartoriusEarth/develop

Edited ConsentService to not provide as many nullpointerexceptions, edit...