Copy default math captcha question to allow custom validate code
Merge branch 'master' into 11551-contact-captcha-error

Conflicts:
	modules/features_default/agov_contact/agov_contact.module
[#9629] Add some default AGLS terms
[#10617] Change order of content type elements to match others
[#9629] Fix typo
Set contact form to use new question
Default challenge is aGov Math
[#9629] Seperate test functionality to base class and add metadata tests
[#9629] Add some default AGLS terms
[#9629] Fix typo
[#9629] Seperate test functionality to base class and add metadata tests
[#9679] Fix merge conflicts
[#10617] Update order of slide fields
[#11562] Fixed menu
Merge pull request #39 from previousnext/11562-header-menu

[#11562] Fixed menu
[#9629] Fix strict warnings
[#10617] Update Feature, fix order of fields
Merge pull request #40 from previousnext/10617-add-form

10617 add form
Merge pull request #37 from previousnext/9629-agls-metadata

[#9629] Add some default AGLS terms
Merge pull request #29 from previousnext/11551-contact-captcha-error

[#11551] Copy default math captcha question to allow custom validate code