BO default templates and AQ default queries and minor datasource issue fix from csm war