FormButton also knows //input
Fix cloud discovery test (form buttons)
   Also clean up imports
Merge pull request #1110 from weissjeffm/discover-fix

Fix cloud discovery test (form buttons)