decom dataset2, replace with dataset1001

remove dataset2 and replace with dataset1001
were it seems appropriate

should have a review by Ariel, just grepping here
for decom

RT: 8512

Change-Id: Idb03926dcef3f86163adb08f56ac1370d6bb5b6b
Merge "decom dataset2, replace with dataset1001" into production