Revert "Rename slap_state to payment_state."

This reverts commit 296fdfb7.

Conflicts:

	master/bt5/vifib_base/bt/revision
	master/bt5/vifib_slap/bt/revision

master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow.xml

@@ -48,7 +48,7 @@
         </item>
         <item>
             <key> <string>state_var</string> </key>
-            <value> <string>payment_state</string> </value>
+            <value> <string>slap_state</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

master/bt5/vifib_base/bt/revision

-365
\ No newline at end of file
+366
\ No newline at end of file

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow.xml

@@ -48,7 +48,7 @@
         </item>
         <item>
             <key> <string>state_var</string> </key>
-            <value> <string>payment_state</string> </value>
+            <value> <string>slap_state</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

master/bt5/vifib_slap/bt/revision

-514
\ No newline at end of file
+515
\ No newline at end of file