Fixups for field_controller
Fixups for field_controller

mnuyens/forseti2,pioneers/forseti2,mnuyens/forseti2,mnuyens/forseti2,pioneers/forseti2,pioneers/forseti2,mnuyens/forseti2,pioneers/forseti2,mnuyens/forseti2