Fix for node count form

The form was mis-matching roles with fields.  Also removed
unnecessary 'requires' logic, as plan validation will take
care of that.

Change-Id: I78a7ae8c81b43da23bd02e7df8873ddf33915788
Merge "Fix for node count form"