Merge branch 'develop' into feature/issue-882-remove-router-setup-from-wizard
Update wizard tests to check validation properly.
Merge pull request #882 from praekelt/feature/issue-882-remove-router-setup-from-wizard

Remove router set up from the wizard