Update uuids for new ctools
Merge branch '7.x-2.x' of github.com:phase2/oa_discussion into og_permission-discussion-reply