fixed merge forward, CRM-12772

----------------------------------------
* CRM-12772: Member Report (Detail) locks in DB with large membership/contribution sets
  https://issues.civicrm.org/jira/browse/CRM-12772
Merge pull request #3919 from kurund/CRM-12772

fixed wrong merge forward, CRM-12772
fixes for CRM-15133

----------------------------------------
* CRM-15133: Do not display upgrade reminder in footer if versionAlert is false
  https://issues.civicrm.org/jira/browse/CRM-15133
Merge pull request #3920 from kurund/CRM-15133

fixes for CRM-15133