Reorganized parameter parsing a bit to work on EUCA-9938, also removed StackEntity from template, to keep objects around longer before being JSONified
Merge branch 'dev/ethomas/EUCA-9938' into testing