CRM-15120 - Mailing labels Prefix missing for Merge labels for contacts with the same address

https://issues.civicrm.org/jira/browse/CRM-15120
indentation fix
Merge pull request #3902 from atif-shaikh/CRM-15120

CRM-15120 - Mailing labels Prefix missing for Merge labels for contacts ...
Fix payment processor form unsaved changes warning
Merge pull request #3933 from colemanw/Fix

Fix payment processor form unsaved changes warning
Merge pull request #3934 from civicrm/master

Merge master into 4.5