Ethiopia flip flops on 'contentious' filling of massive dam