Splits up activate and create dataset in dpms
Merge pull request #1943 from lukecampbell/dpms-refactor

OOIION-1797 Splits creating a dataset and activating into two distinct methods