BO Xml templates should have container Id instead of form Id
Merge branch 'cp_30' of https://github.com/NCIP/catissue-migration-tool into cp_30