Changed all cdh5 references to hdp2