merge from cpliakas/acquia-sdk-php bf1a4c9209d90f6e559582c4c794a2abe9049e2c