Add new constructor to FormInstanceTag and moved parseFormInstanceTag
from Util to the FormInstanceTag class.  The version in Util has been
deprecated.
Merge remote-tracking branch 'origin/master' into ErrorCategoryLookup

Conflicts:
	metadata/config.xml