CRM-14784 fix - The update greetings job times out without saving to the database

https://issues.civicrm.org/jira/browse/CRM-14784
Merge pull request #3523 from monishdeb/CRM-14784

CRM-14784 fix - The update greetings job times out without saving to the...
CRM-14816 - Order Rows widget is broken again

https://issues.civicrm.org/jira/browse/CRM-14816
Merge pull request #3524 from atif-shaikh/CRM-14816

CRM-14816 - Order Rows widget is broken again