Revert "Resolve Merge Conflicts in Admin Assembly"

This reverts commit 62bfb76185f5b710bc853fc4de4ccb41584510de.
Resolve Conflicting Transitive Dependencies

of the DFP API Java client.
Merge pull request #4126 from guardian/kc-assembly-conflict

Resolve Conflicting Transitive Dependencies