OP-316 internally prefixing form ids with their site template ids (when defined in a site template) so that we can merge them separately at runtime
OP-316 merging site template specific forms at runtime (it gets caches, worry not)
OP-316 Fixing the way in which runtime site template form merging happens (based on site template, not site id) + other tweaks to make the system all work in practice rather than just in test suite)