Fix locales for organization page
Fix sub-organization edit link display
Fix conflict after merging MH-536 to dev