Merge pull request #2276 from colemanw/4.4

CRM-14024 - Get rid of redundant fn
Merge pull request #2173 from webpartners/master

CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on tokens
CRM-13492 d6 & d7 url functions are identical except for one missing param on d6, move d7 to DrupalBase, delete d6 & d7 versions

----------------------------------------
* CRM-13492: buildAmount Hook functionality changed -- difficult to use / undocumented
  http://issues.civicrm.org/jira/browse/CRM-13492
CRM-13492 specify  = TRUE on navigation menu - this will cause urls to have &amp; not & in them
(Am currently unsure about the ones which have inconsistently stored a '?' in the civicrm_navigation menu - ie.
http://issues.civicrm.org/jira/browse/CRM-13942?focusedCommentId=54821&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-54821
as I cleaned them out of my DB)

----------------------------------------
* CRM-13492: buildAmount Hook functionality changed -- difficult to use / undocumented
  http://issues.civicrm.org/jira/browse/CRM-13492
 CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on tokens
Merge pull request #2277 from eileenmcnaughton/CRM-13492

CRM-13942  navigation menu is not valid html
Merge pull request #2272 from eileenmcnaughton/test-fixes

Test fixes / enotice compliance
Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
	CRM/Core/BAO/Navigation.php
	xml/schema/Mailing/Event/Bounce.xml
CRM-14043 - cid=0 contribution form giving contribution to logged in user

----------------------------------------
* CRM-14043: cid=0 contribution form giving contribution to logged in user
  http://issues.civicrm.org/jira/browse/CRM-14043
Remove unused fn buildAddressBlock
Merge pull request #2279 from colemanw/optionForms

CRM-13970 - Add helper for getting page path
Remove functions that are never called
Merge pull request #2280 from colemanw/addShowHide

Remove functions that are never called
tests/phpunit - Fix for running with MySQL on alternative port
Merge pull request #2281 from totten/master-unittest-mysqlport

tests/phpunit - Fix for running with MySQL on alternative port
Additional Test, fix typos (mis-cased class-names), commit updated test-generated examples
Merge pull request #2284 from eileenmcnaughton/extra-test

Additional Test, fix typos (mis-cased class-names), commit updated test-...
fix mis-spellings & undeclared variables
extra setting test - hookt pu
CRM-14030 : applied patch for 4.4 version