CRM-14165 - Improve option page lookup
CRM-13970 - Fix admin option links
CRM-14165 - Improve option popup editor
Merge pull request #2481 from colemanw/options

cow:options