Refactor form state storage

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Unit test passes: yes
Behat scenarios passes: yes
Checkstyle issues: no
ChangeLog updated: no
Documentation PR: ~
Fixes the following jira:
 - PIM-1642