Adds dataset_id to create_data_product and fixes activate/suspend