changed UserFormPlaceParser format :
 * #form/a34234/s2343
 * #form/{defId}/{siteId}
Merge remote-tracking branch 'origin/version3' into version3