CRM-13964-qa : some more fixes / additions done