Add mysqli support - constants and checking in mysqli_options() for the
new constant for password expriration
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'