Don't use define_method with static method names and don't define methods in 'included' block unless necessary.
Merge pull request #858 from alphagov/change_strange_method_definitions_in_edition_concerns

Changes some methods defined with 'define_method' in Edition concerns to be normal module methods.