notice fixes
Merge branch 'master' of github.com:webaccess/civicrm-core into pop-fixes