CRM-15925 CRM-15928 Port changes from Totten#8957

Merged

eileenmcnaughton merged 2 commits intocivicrm:4.6from seamuslee001:port_totten_nags

Sep 1, 2016

+25-1

Commits on Aug 30, 2016

CRM-15925 - CRM/Upgrade - Add post-upgrade msg re: "import SQL datasource"
seamuslee001
committed
CRM-15928 - Display warning if is enabled
seamuslee001
committed