Changing IDs for waf delete buttons.
Merge commit '3dcb72c51ac3d8114632008c7d7c9ea60c587564' into HEAD