Crm 13965 qa fixes and work on CRM-13973

Done with fixes of points mentioned by dgg after 1st QA round : http://issues.civicrm.org/jira/browse/CRM-13965?focusedCommentId=57260#comment-57260

Also consists of work on CRM-13973 issue fixes.