diff --git a/lib/Zend/Amf/Parse/Amf3/Deserializer.php b/lib/Zend/Amf/Parse/Amf3/Deserializer.php
index d435270f38b..a058fa19c58 100644
--- a/lib/Zend/Amf/Parse/Amf3/Deserializer.php
+++ b/lib/Zend/Amf/Parse/Amf3/Deserializer.php
@@ -420,6 +420,6 @@ public function readXmlString()
         $xmlReference = $this->readInteger();
         $length = $xmlReference >> 1;
         $string = $this->_stream->readBytes($length);
-        return Zend_Xml_Security::scan($string); 
+        return Zend_Xml_Security::scan($string);
     }
 }
diff --git a/lib/Zend/Amf/Parse/Amf3/Serializer.php b/lib/Zend/Amf/Parse/Amf3/Serializer.php
index 5c3b22be3b3..8e00e62e4d4 100644
--- a/lib/Zend/Amf/Parse/Amf3/Serializer.php
+++ b/lib/Zend/Amf/Parse/Amf3/Serializer.php
@@ -236,8 +236,8 @@ public function writeString(&$string)
             return $this;
         }
 
-        $ref = array_key_exists($string, $this->_referenceStrings) 
-             ? $this->_referenceStrings[$string] 
+        $ref = array_key_exists($string, $this->_referenceStrings)
+             ? $this->_referenceStrings[$string]
              : false;
         if ($ref === false){
             $this->_referenceStrings[$string] = count($this->_referenceStrings);
@@ -389,8 +389,8 @@ protected function writeObjectReference(&$object, $objectByVal = false)
         }
 
         $hash = spl_object_hash($object);
-        $ref = array_key_exists($hash, $this->_referenceObjects) 
-             ? $this->_referenceObjects[$hash] 
+        $ref = array_key_exists($hash, $this->_referenceObjects)
+             ? $this->_referenceObjects[$hash]
              : false;
 
         // quickly handle object references
diff --git a/lib/Zend/Amf/Server.php b/lib/Zend/Amf/Server.php
index a0c86d68ac2..e8f429bfc1a 100644
--- a/lib/Zend/Amf/Server.php
+++ b/lib/Zend/Amf/Server.php
@@ -142,7 +142,7 @@ public function __construct()
     /**
      * Set authentication adapter
      *
-     * If the authentication adapter implements a "getAcl()" method, populate 
+     * If the authentication adapter implements a "getAcl()" method, populate
      * the ACL of this instance with it (if none exists already).
      *
      * @param  Zend_Amf_Auth_Abstract $auth
@@ -506,7 +506,7 @@ protected function _handle(Zend_Amf_Request $request)
         // Authenticate, if we have credential headers
         $error   = false;
         $headers = $request->getAmfHeaders();
-        if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) 
+        if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER])
             && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)
             && isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)
         ) {
@@ -530,8 +530,8 @@ protected function _handle(Zend_Amf_Request $request)
             } catch (Exception $e) {
                 // Error during authentication; report it
                 $error = $this->_errorMessage(
-                    $objectEncoding, 
-                    '', 
+                    $objectEncoding,
+                    '',
                     $e->getMessage(),
                     $e->getTraceAsString(),
                     $e->getCode(),
@@ -970,9 +970,9 @@ public function listMethods()
      *
      * Takes the provided parameters from the request, and attempts to cast them
      * to objects, if the prototype defines any as explicit object types
-     * 
-     * @param  Reflection $reflectionMethod 
-     * @param  array $params 
+     *
+     * @param  Reflection $reflectionMethod
+     * @param  array $params
      * @return array
      */
     protected function _castParameters($reflectionMethod, array $params)
diff --git a/lib/Zend/Application/Resource/Db.php b/lib/Zend/Application/Resource/Db.php
index 0840fea93c4..2747368758e 100644
--- a/lib/Zend/Application/Resource/Db.php
+++ b/lib/Zend/Application/Resource/Db.php
@@ -141,7 +141,7 @@ public function getDbAdapter()
         ) {
             $this->_db = Zend_Db::factory($adapter, $this->getParams());
 
-            if ($this->_db instanceof Zend_Db_Adapter_Abstract 
+            if ($this->_db instanceof Zend_Db_Adapter_Abstract
                 && $this->isDefaultTableAdapter()
             ) {
                 Zend_Db_Table::setDefaultAdapter($this->_db);
diff --git a/lib/Zend/Application/Resource/Frontcontroller.php b/lib/Zend/Application/Resource/Frontcontroller.php
index 73fe61b6115..631bd8fa1c1 100644
--- a/lib/Zend/Application/Resource/Frontcontroller.php
+++ b/lib/Zend/Application/Resource/Frontcontroller.php
@@ -143,7 +143,7 @@ public function init()
                     if (!isset($value['params'])) {
                         $value['params'] = array();
                     }
-                    
+
                     $dispatchClass = $value['class'];
                     if (!class_exists($dispatchClass)) {
                         #require_once 'Zend/Application/Exception.php';
diff --git a/lib/Zend/Application/Resource/Useragent.php b/lib/Zend/Application/Resource/Useragent.php
index 1ac40a3256d..83945cd4f21 100644
--- a/lib/Zend/Application/Resource/Useragent.php
+++ b/lib/Zend/Application/Resource/Useragent.php
@@ -32,7 +32,7 @@ class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_Reso
      * @var Zend_Http_UserAgent
      */
     protected $_userAgent;
-    
+
     /**
      * Intialize resource
      *
@@ -54,7 +54,7 @@ public function init()
 
         return $userAgent;
     }
-    
+
     /**
      * Get UserAgent instance
      *
@@ -66,7 +66,7 @@ public function getUserAgent()
             $options = $this->getOptions();
             $this->_userAgent = new Zend_Http_UserAgent($options);
         }
-        
+
         return $this->_userAgent;
     }
 }
diff --git a/lib/Zend/Cache/Backend/TwoLevels.php b/lib/Zend/Cache/Backend/TwoLevels.php
index 0b8afdf4c34..48835eb4259 100644
--- a/lib/Zend/Cache/Backend/TwoLevels.php
+++ b/lib/Zend/Cache/Backend/TwoLevels.php
@@ -76,7 +76,7 @@ class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Ca
      * - If true, automatically fill the fast cache when a cache record was not found in fast cache, but did
      *   exist in slow cache. This can be usefull when a non-persistent cache like APC or Memcached got
      *   purged for whatever reason.
-     * 
+     *
      * =====> (boolean) auto_refresh_fast_cache
      * - If true, auto refresh the fast cache when a cache record is hit
      *
@@ -238,7 +238,7 @@ public function load($id, $doNotTestCacheValidity = false)
             }
         }
         $array = $resultFast !== false ? unserialize($resultFast) : unserialize($resultSlow);
-        
+
         //In case no cache entry was found in the FastCache and auto-filling is enabled, copy data to FastCache
         if ($resultFast === false && $this->_options['auto_fill_fast_cache']) {
             $preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']);
diff --git a/lib/Zend/Captcha/Dumb.php b/lib/Zend/Captcha/Dumb.php
index c8488688181..803f15e3d5d 100644
--- a/lib/Zend/Captcha/Dumb.php
+++ b/lib/Zend/Captcha/Dumb.php
@@ -41,7 +41,7 @@ class Zend_Captcha_Dumb extends Zend_Captcha_Word
      * @type string
      */
     protected $_label = 'Please type this word backwards';
-    
+
     /**
      * Set the label for the CAPTCHA
      * @param string $label
@@ -50,7 +50,7 @@ public function setLabel($label)
     {
         $this->_label = $label;
     }
-    
+
     /**
      * Retrieve the label for the CAPTCHA
      * @return string
diff --git a/lib/Zend/Captcha/Word.php b/lib/Zend/Captcha/Word.php
index d24b826fe05..617bae19ff8 100644
--- a/lib/Zend/Captcha/Word.php
+++ b/lib/Zend/Captcha/Word.php
@@ -250,7 +250,7 @@ public function setUseNumbers($_useNumbers)
         $this->_useNumbers = $_useNumbers;
         return $this;
     }
-    
+
     /**
      * Get session object
      *
diff --git a/lib/Zend/Cloud/Infrastructure/Adapter.php b/lib/Zend/Cloud/Infrastructure/Adapter.php
index 1192127aa67..bc3c1cdec32 100644
--- a/lib/Zend/Cloud/Infrastructure/Adapter.php
+++ b/lib/Zend/Cloud/Infrastructure/Adapter.php
@@ -9,15 +9,15 @@
 
 /**
  * Adapter interface for infrastructure service
- * 
+ *
  * @package    Zend_Cloud
  * @subpackage Infrastructure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Zend_Cloud_Infrastructure_Adapter 
-{ 
-    const HTTP_ADAPTER = 'http_adapter'; 
+interface Zend_Cloud_Infrastructure_Adapter
+{
+    const HTTP_ADAPTER = 'http_adapter';
 
     /**
      * The max. amount of time, in seconds, to wait for a status change
@@ -33,90 +33,90 @@ interface Zend_Cloud_Infrastructure_Adapter
      * Return a list of the available instances
      *
      * @return InstanceList
-     */ 
-    public function listInstances(); 
- 
+     */
+    public function listInstances();
+
     /**
      * Return the status of an instance
      *
      * @param  string $id
      * @return string
-     */ 
-    public function statusInstance($id); 
+     */
+    public function statusInstance($id);
 
     /**
      * Wait for status $status with a timeout of $timeout seconds
-     * 
+     *
      * @param  string $id
      * @param  string $status
-     * @param  integer $timeout 
+     * @param  integer $timeout
      * @return boolean
      */
     public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE);
-    
+
     /**
      * Return the public DNS name of the instance
-     * 
+     *
      * @param  string $id
-     * @return string|boolean 
+     * @return string|boolean
      */
     public function publicDnsInstance($id);
-    
+
     /**
      * Reboot an instance
      *
      * @param string $id
      * @return boolean
-     */ 
-    public function rebootInstance($id); 
- 
+     */
+    public function rebootInstance($id);
+
     /**
      * Create a new instance
      *
      * @param  string $name
      * @param  array $options
      * @return boolean
-     */ 
-    public function createInstance($name, $options); 
- 
+     */
+    public function createInstance($name, $options);
+
     /**
      * Stop the execution of an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
-    public function stopInstance($id); 
- 
+     */
+    public function stopInstance($id);
+
     /**
      * Start the execution of an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
-    public function startInstance($id); 
- 
+     */
+    public function startInstance($id);
+
     /**
      * Destroy an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
-    public function destroyInstance($id); 
- 
+     */
+    public function destroyInstance($id);
+
     /**
      * Return all the available instances images
      *
      * @return ImageList
-     */ 
-    public function imagesInstance(); 
-    
+     */
+    public function imagesInstance();
+
     /**
      * Return all the available zones
-     * 
+     *
      * @return array
      */
     public function zonesInstance();
-    
+
     /**
      * Return the system informations about the $metric of an instance
      *
@@ -124,9 +124,9 @@ public function zonesInstance();
      * @param  string $metric
      * @param  array $options
      * @return array
-     */ 
-    public function monitorInstance($id, $metric, $options = null); 
- 
+     */
+    public function monitorInstance($id, $metric, $options = null);
+
     /**
      * Run arbitrary shell script on an instance
      *
@@ -134,34 +134,34 @@ public function monitorInstance($id, $metric, $options = null);
      * @param  array $param
      * @param  string|array $cmd
      * @return string|array
-     */ 
+     */
     public function deployInstance($id, $param, $cmd);
-            
+
     /**
      * Get the adapter instance
-     * 
+     *
      * @return object
      */
     public function getAdapter();
-    
+
     /**
      * Get the adapter result
-     * 
+     *
      * @return array
      */
     public function getAdapterResult();
-    
+
     /**
      * Get the last HTTP response
-     * 
+     *
      * @return Zend_Http_Response
      */
     public function getLastHttpResponse();
-    
+
     /**
      * Get the last HTTP request
-     * 
+     *
      * @return string
      */
     public function getLastHttpRequest();
-} 
+}
diff --git a/lib/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php b/lib/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php
index 7a5fbcd366e..2b729a0daa2 100644
--- a/lib/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php
+++ b/lib/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php
@@ -33,14 +33,14 @@ abstract class Zend_Cloud_Infrastructure_Adapter_AbstractAdapter implements Zend
 {
     /**
      * Store the last response from the adpter
-     * 
+     *
      * @var array
      */
     protected $adapterResult;
-    
+
     /**
      * Valid metrics for monitor
-     * 
+     *
      * @var array
      */
     protected $validMetrics = array(
@@ -65,10 +65,10 @@ public function getAdapterResult()
 
     /**
      * Wait for status $status with a timeout of $timeout seconds
-     * 
+     *
      * @param  string $id
      * @param  string $status
-     * @param  integer $timeout 
+     * @param  integer $timeout
      * @return boolean
      */
     public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS_CHANGE)
@@ -92,7 +92,7 @@ public function waitStatusInstance($id, $status, $timeout = self::TIMEOUT_STATUS
      * @param  array $param
      * @param  string|array $cmd
      * @return string|array
-     */ 
+     */
     public function deployInstance($id, $params, $cmd)
     {
         if (!function_exists("ssh2_connect")) {
@@ -110,9 +110,9 @@ public function deployInstance($id, $params, $cmd)
             throw new Zend_Cloud_Infrastructure_Exception('You must specify the shell commands to run on the instance');
         }
 
-        if (empty($params) 
-            || empty($params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME]) 
-            || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD]) 
+        if (empty($params)
+            || empty($params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME])
+            || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])
                 && empty($params[Zend_Cloud_Infrastructure_Instance::SSH_KEY]))
         ) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
@@ -123,13 +123,13 @@ public function deployInstance($id, $params, $cmd)
         if (empty($host)) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception(sprintf(
-                'The instance identified by "%s" does not exist', 
+                'The instance identified by "%s" does not exist',
                 $id
             ));
         }
 
         $conn = ssh2_connect($host);
-        if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME], 
+        if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME],
                 $params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('SSH authentication failed');
@@ -142,11 +142,11 @@ public function deployInstance($id, $params, $cmd)
                 $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
 
                 stream_set_blocking($errorStream, true);
-                stream_set_blocking($stream, true); 
+                stream_set_blocking($stream, true);
 
                 $output = stream_get_contents($stream);
                 $error  = stream_get_contents($errorStream);
-                
+
                 if (empty($error)) {
                     $result[$command] = $output;
                 } else {
@@ -159,17 +159,17 @@ public function deployInstance($id, $params, $cmd)
             $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
 
             stream_set_blocking($errorStream, true);
-            stream_set_blocking($stream, true); 
+            stream_set_blocking($stream, true);
 
             $output = stream_get_contents($stream);
             $error  = stream_get_contents($errorStream);
-            
+
             if (empty($error)) {
                 $result = $output;
             } else {
                 $result = $error;
             }
-        }    
+        }
         return $result;
     }
 }
diff --git a/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php b/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php
index c10d6ee8865..defb5633c77 100644
--- a/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php
+++ b/lib/Zend/Cloud/Infrastructure/Adapter/Ec2.php
@@ -36,58 +36,58 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad
     const AWS_SECURITY_GROUP = 'securityGroup';
 
     /**
-     * Ec2 Instance 
-     * 
+     * Ec2 Instance
+     *
      * @var Ec2Instance
      */
     protected $ec2;
 
     /**
      * Ec2 Image
-     * 
+     *
      * @var Ec2Image
      */
     protected $ec2Image;
 
     /**
      * Ec2 Zone
-     * 
+     *
      * @var Ec2Zone
      */
     protected $ec2Zone;
 
     /**
-     * Ec2 Monitor 
-     * 
+     * Ec2 Monitor
+     *
      * @var Ec2Monitor
      */
     protected $ec2Monitor;
 
     /**
      * AWS Access Key
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $accessKey;
 
     /**
      * AWS Access Secret
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $accessSecret;
 
     /**
-     * Region zone 
-     * 
-     * @var string 
+     * Region zone
+     *
+     * @var string
      */
     protected $region;
 
     /**
      * Map array between EC2 and Infrastructure status
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $mapStatus = array (
         'running'       => Zend_Cloud_Infrastructure_Instance::STATUS_RUNNING,
@@ -101,8 +101,8 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad
 
     /**
      * Map monitor metrics between Infrastructure and EC2
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $mapMetrics= array (
         Zend_Cloud_Infrastructure_Instance::MONITOR_CPU         => 'CPUUtilization',
@@ -127,13 +127,13 @@ public function __construct($options = array())
                 $options = iterator_to_array($options);
             }
         }
-        
+
         if (empty($options) || !is_array($options)) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided');
         }
-        
-        if (!isset($options[self::AWS_ACCESS_KEY]) 
+
+        if (!isset($options[self::AWS_ACCESS_KEY])
             || !isset($options[self::AWS_SECRET_KEY])
         ) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
@@ -162,13 +162,13 @@ public function __construct($options = array())
 
     /**
      * Convert the attributes of EC2 into attributes of Infrastructure
-     * 
+     *
      * @param  array $attr
-     * @return array|boolean 
+     * @return array|boolean
      */
     private function convertAttributes($attr)
     {
-        $result = array();       
+        $result = array();
         if (!empty($attr) && is_array($attr)) {
             $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ID]         = $attr['instanceId'];
             $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_STATUS]     = $this->mapStatus[$attr['instanceState']['name']];
@@ -216,8 +216,8 @@ private function convertAttributes($attr)
      * Return a list of the available instancies
      *
      * @return Zend_Cloud_Infrastructure_InstanceList
-     */ 
-    public function listInstances() 
+     */
+    public function listInstances()
     {
         $this->adapterResult = $this->ec2->describe();
 
@@ -233,29 +233,29 @@ public function listInstances()
      *
      * @param  string
      * @return string|boolean
-     */ 
+     */
     public function statusInstance($id)
     {
         $this->adapterResult = $this->ec2->describe($id);
         if (empty($this->adapterResult['instances'])) {
             return false;
-        }    
+        }
         $result = $this->adapterResult['instances'][0];
         return $this->mapStatus[$result['instanceState']['name']];
     }
 
     /**
      * Return the public DNS name of the instance
-     * 
+     *
      * @param  string $id
-     * @return string|boolean 
+     * @return string|boolean
      */
-    public function publicDnsInstance($id) 
+    public function publicDnsInstance($id)
     {
         $this->adapterResult = $this->ec2->describe($id);
         if (empty($this->adapterResult['instances'])) {
             return false;
-        }    
+        }
         $result = $this->adapterResult['instances'][0];
         return $result['dnsName'];
     }
@@ -265,7 +265,7 @@ public function publicDnsInstance($id)
      *
      * @param string $id
      * @return boolean
-     */ 
+     */
     public function rebootInstance($id)
     {
         $this->adapterResult= $this->ec2->reboot($id);
@@ -278,7 +278,7 @@ public function rebootInstance($id)
      * @param string $name
      * @param array $options
      * @return Instance|boolean
-     */ 
+     */
     public function createInstance($name, $options)
     {
         // @todo instance's name management?
@@ -295,42 +295,42 @@ public function createInstance($name, $options)
      *
      * @param  string $id
      * @return boolean
-     */ 
+     */
     public function stopInstance($id)
     {
         #require_once 'Zend/Cloud/Infrastructure/Exception.php';
         throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter');
     }
- 
+
     /**
      * Start an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
+     */
     public function startInstance($id)
     {
         #require_once 'Zend/Cloud/Infrastructure/Exception.php';
         throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter');
     }
- 
+
     /**
      * Destroy an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
+     */
     public function destroyInstance($id)
     {
         $this->adapterResult = $this->ec2->terminate($id);
         return (!empty($this->adapterResult));
     }
- 
+
     /**
      * Return a list of all the available instance images
      *
      * @return ImageList
-     */ 
+     */
     public function imagesInstance()
     {
         if (!isset($this->ec2Image)) {
@@ -338,7 +338,7 @@ public function imagesInstance()
         }
 
         $this->adapterResult = $this->ec2Image->describe();
-                
+
         $images = array();
 
         foreach ($this->adapterResult as $result) {
@@ -365,7 +365,7 @@ public function imagesInstance()
 
     /**
      * Return all the available zones
-     * 
+     *
      * @return array
      */
     public function zonesInstance()
@@ -388,12 +388,12 @@ public function zonesInstance()
 
     /**
      * Return the system information about the $metric of an instance
-     * 
+     *
      * @param  string $id
      * @param  string $metric
      * @param  null|array $options
      * @return array
-     */ 
+     */
     public function monitorInstance($id, $metric, $options = null)
     {
         if (empty($id) || empty($metric)) {
@@ -403,7 +403,7 @@ public function monitorInstance($id, $metric, $options = null)
         if (!in_array($metric,$this->validMetrics)) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception(sprintf(
-                'The metric "%s" is not valid', 
+                'The metric "%s" is not valid',
                 $metric
             ));
         }
@@ -413,8 +413,8 @@ public function monitorInstance($id, $metric, $options = null)
             throw new Zend_Cloud_Infrastructure_Exception('The options must be an array');
         }
 
-        if (!empty($options) 
-            && (empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]) 
+        if (!empty($options)
+            && (empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME])
                 || empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME]))
         ) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
@@ -423,7 +423,7 @@ public function monitorInstance($id, $metric, $options = null)
                 $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME],
                 $options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME]
             ));
-        }      
+        }
 
         if (!isset($this->ec2Monitor)) {
             $this->ec2Monitor = new Zend_Service_Amazon_Ec2_CloudWatch($this->accessKey, $this->accessSecret, $this->region);
@@ -465,8 +465,8 @@ public function monitorInstance($id, $metric, $options = null)
     }
 
     /**
-     * Get the adapter 
-     * 
+     * Get the adapter
+     *
      * @return Zend_Service_Amazon_Ec2_Instance
      */
     public function getAdapter()
@@ -476,8 +476,8 @@ public function getAdapter()
 
     /**
      * Get last HTTP request
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getLastHttpRequest()
     {
@@ -486,8 +486,8 @@ public function getLastHttpRequest()
 
     /**
      * Get the last HTTP response
-     * 
-     * @return Zend_Http_Response 
+     *
+     * @return Zend_Http_Response
      */
     public function getLastHttpResponse()
     {
diff --git a/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
index f1b38dd0e37..c23f627e76f 100644
--- a/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
+++ b/lib/Zend/Cloud/Infrastructure/Adapter/Rackspace.php
@@ -34,40 +34,40 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct
     const RACKSPACE_ZONE_UK   = 'UK';
     const MONITOR_CPU_SAMPLES = 3;
     /**
-     * Rackspace Servers Instance 
-     * 
+     * Rackspace Servers Instance
+     *
      * @var Zend_Service_Rackspace_Servers
      */
     protected $rackspace;
     /**
      * Rackspace access user
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $accessUser;
 
     /**
      * Rackspace access key
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $accessKey;
     /**
      * Rackspace Region
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $region;
     /**
      * Flavors
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $flavors;
     /**
      * Map array between Rackspace and Infrastructure status
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $mapStatus = array (
         'ACTIVE'             => Zend_Cloud_Infrastructure_Instance::STATUS_RUNNING,
@@ -102,12 +102,12 @@ public function __construct($options = array())
                 $options = iterator_to_array($options);
             }
         }
-        
+
         if (empty($options) || !is_array($options)) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided');
         }
-        
+
         if (!isset($options[self::RACKSPACE_USER])) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('Rackspace access user not specified!');
@@ -117,10 +117,10 @@ public function __construct($options = array())
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('Rackspace access key not specified!');
         }
-        
+
         $this->accessUser = $options[self::RACKSPACE_USER];
         $this->accessKey  = $options[self::RACKSPACE_KEY];
-        
+
         if (isset($options[self::RACKSPACE_REGION])) {
             switch ($options[self::RACKSPACE_REGION]) {
                 case self::RACKSPACE_ZONE_UK:
@@ -147,17 +147,17 @@ public function __construct($options = array())
         if (isset($options[self::HTTP_ADAPTER])) {
             $this->rackspace->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]);
         }
-        
+
     }
     /**
      * Convert the attributes of Rackspace server into attributes of Infrastructure
-     * 
+     *
      * @param  array $attr
-     * @return array|boolean 
+     * @return array|boolean
      */
     protected function convertAttributes($attr)
     {
-        $result = array();       
+        $result = array();
         if (!empty($attr) && is_array($attr)) {
             $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_ID]      = $attr['id'];
             $result[Zend_Cloud_Infrastructure_Instance::INSTANCE_NAME]    = $attr['name'];
@@ -177,8 +177,8 @@ protected function convertAttributes($attr)
      * Return a list of the available instancies
      *
      * @return InstanceList|boolean
-     */ 
-    public function listInstances() 
+     */
+    public function listInstances()
     {
         $this->adapterResult = $this->rackspace->listServers(true);
         if ($this->adapterResult===false) {
@@ -196,7 +196,7 @@ public function listInstances()
      *
      * @param  string
      * @return string|boolean
-     */ 
+     */
     public function statusInstance($id)
     {
         $this->adapterResult = $this->rackspace->getServer($id);
@@ -208,16 +208,16 @@ public function statusInstance($id)
     }
     /**
      * Return the public DNS name/Ip address of the instance
-     * 
+     *
      * @param  string $id
-     * @return string|boolean 
+     * @return string|boolean
      */
-    public function publicDnsInstance($id) 
+    public function publicDnsInstance($id)
     {
         $this->adapterResult = $this->rackspace->getServerPublicIp($id);
         if (empty($this->adapterResult)) {
             return false;
-        }    
+        }
         return $this->adapterResult[0];
     }
     /**
@@ -225,7 +225,7 @@ public function publicDnsInstance($id)
      *
      * @param string $id
      * @return boolean
-     */ 
+     */
     public function rebootInstance($id)
     {
         return $this->rackspace->rebootServer($id,true);
@@ -236,7 +236,7 @@ public function rebootInstance($id)
      * @param string $name
      * @param array $options
      * @return Instance|boolean
-     */ 
+     */
     public function createInstance($name, $options)
     {
         if (empty($name)) {
@@ -270,31 +270,31 @@ public function createInstance($name, $options)
      *
      * @param  string $id
      * @return boolean
-     */ 
+     */
     public function stopInstance($id)
     {
         #require_once 'Zend/Cloud/Infrastructure/Exception.php';
         throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter');
     }
- 
+
     /**
      * Start an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
+     */
     public function startInstance($id)
     {
         #require_once 'Zend/Cloud/Infrastructure/Exception.php';
         throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter');
     }
- 
+
     /**
      * Destroy an instance
      *
      * @param  string $id
      * @return boolean
-     */ 
+     */
     public function destroyInstance($id)
     {
         $this->adapterResult= $this->rackspace->deleteServer($id);
@@ -304,17 +304,17 @@ public function destroyInstance($id)
      * Return a list of all the available instance images
      *
      * @return ImageList|boolean
-     */ 
+     */
     public function imagesInstance()
     {
         $this->adapterResult = $this->rackspace->listImages(true);
         if ($this->adapterResult===false) {
             return false;
         }
-        
+
         $images= $this->adapterResult->toArray();
         $result= array();
-        
+
         foreach ($images as $image) {
             if (strtolower($image['status'])==='active') {
                 if (strpos($image['name'],'Windows')!==false) {
@@ -340,7 +340,7 @@ public function imagesInstance()
     }
     /**
      * Return all the available zones
-     * 
+     *
      * @return array
      */
     public function zonesInstance()
@@ -350,12 +350,12 @@ public function zonesInstance()
     /**
      * Return the system information about the $metric of an instance
      * NOTE: it works only for Linux servers
-     * 
+     *
      * @param  string $id
      * @param  string $metric
      * @param  null|array $options
      * @return array|boolean
-     */ 
+     */
     public function monitorInstance($id, $metric, $options = null)
     {
         if (!function_exists("ssh2_connect")) {
@@ -378,7 +378,7 @@ public function monitorInstance($id, $metric, $options = null)
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('The options must be an array');
         }
-        
+
         switch ($metric) {
             case Zend_Cloud_Infrastructure_Instance::MONITOR_CPU:
                 $cmd= 'top -b -n '.self::MONITOR_CPU_SAMPLES.' | grep \'Cpu\'';
@@ -394,14 +394,14 @@ public function monitorInstance($id, $metric, $options = null)
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('The metric specified is not supported by the adapter');
         }
-        
+
         $params= array(
             Zend_Cloud_Infrastructure_Instance::SSH_USERNAME => $options['username'],
             Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD => $options['password']
         );
         $exec_time= time();
         $result= $this->deployInstance($id,$params,$cmd);
-        
+
         if (empty($result)) {
             return false;
         }
@@ -428,7 +428,7 @@ public function monitorInstance($id, $metric, $options = null)
                         }
                         if ($total>0) {
                             $usage= (float) $used/$total;
-                        }    
+                        }
                         break;
                     case Zend_Cloud_Infrastructure_Instance::MONITOR_DISK:
                         if (preg_match('/(\d+)%/', $output,$match)) {
@@ -436,26 +436,26 @@ public function monitorInstance($id, $metric, $options = null)
                         }
                         break;
                 }
-                
+
                 $monitor['series'][] = array (
                     'timestamp' => $exec_time,
                     'value'     => number_format($usage,2).'%'
                 );
-                
+
                 $average += $usage;
                 $exec_time+= 60; // seconds
                 $num++;
             }
         }
-        
+
         if ($num>0) {
             $monitor['average'] = number_format($average/$num,2).'%';
         }
         return $monitor;
     }
     /**
-     * Get the adapter 
-     * 
+     * Get the adapter
+     *
      * @return Zend_Service_Rackspace_Servers
      */
     public function getAdapter()
@@ -464,8 +464,8 @@ public function getAdapter()
     }
     /**
      * Get last HTTP request
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getLastHttpRequest()
     {
@@ -473,8 +473,8 @@ public function getLastHttpRequest()
     }
     /**
      * Get the last HTTP response
-     * 
-     * @return Zend_Http_Response 
+     *
+     * @return Zend_Http_Response
      */
     public function getLastHttpResponse()
     {
diff --git a/lib/Zend/Cloud/Infrastructure/Exception.php b/lib/Zend/Cloud/Infrastructure/Exception.php
index 3645bb07ef2..0f1a0700497 100644
--- a/lib/Zend/Cloud/Infrastructure/Exception.php
+++ b/lib/Zend/Cloud/Infrastructure/Exception.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Exception
- * 
+ *
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage Infrastructure
diff --git a/lib/Zend/Cloud/Infrastructure/Factory.php b/lib/Zend/Cloud/Infrastructure/Factory.php
index 9cc4754c9d3..f8999df5e0e 100644
--- a/lib/Zend/Cloud/Infrastructure/Factory.php
+++ b/lib/Zend/Cloud/Infrastructure/Factory.php
@@ -12,7 +12,7 @@
 
 /**
  * Factory for infrastructure adapters
- * 
+ *
  * @package    Zend_Cloud
  * @subpackage Infrastructure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
diff --git a/lib/Zend/Cloud/Infrastructure/Image.php b/lib/Zend/Cloud/Infrastructure/Image.php
index c77cd1c51a5..0212fc73da3 100644
--- a/lib/Zend/Cloud/Infrastructure/Image.php
+++ b/lib/Zend/Cloud/Infrastructure/Image.php
@@ -9,13 +9,13 @@
 
 /**
  * Instance of an infrastructure service
- * 
+ *
  * @package    Zend_Cloud
  * @subpackage Infrastructure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_Infrastructure_Image 
+class Zend_Cloud_Infrastructure_Image
 {
     const IMAGE_ID           = 'imageId';
     const IMAGE_OWNERID      = 'ownerId';
@@ -30,37 +30,37 @@ class Zend_Cloud_Infrastructure_Image
 
     /**
      * Image's attributes
-     * 
+     *
      * @var array
      */
     protected $attributes = array();
 
     /**
      * The Image adapter (if exists)
-     * 
+     *
      * @var object
      */
     protected $adapter;
 
     /**
      * Required attributes
-     * 
+     *
      * @var array
      */
     protected $attributeRequired = array(
-        self::IMAGE_ID, 
-        self::IMAGE_DESCRIPTION, 
-        self::IMAGE_PLATFORM, 
+        self::IMAGE_ID,
+        self::IMAGE_DESCRIPTION,
+        self::IMAGE_PLATFORM,
         self::IMAGE_ARCHITECTURE,
     );
 
     /**
      * Constructor
-     * 
+     *
      * @param array $data
-     * @param object $adapter 
+     * @param object $adapter
      */
-    public function __construct($data, $adapter = null) 
+    public function __construct($data, $adapter = null)
     {
         if (is_object($data)) {
             if (method_exists($data, 'toArray')) {
@@ -69,7 +69,7 @@ public function __construct($data, $adapter = null)
                 $data = iterator_to_array($data);
             }
         }
-        
+
         if (empty($data) || !is_array($data)) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of parameters');
@@ -96,7 +96,7 @@ public function __construct($data, $adapter = null)
      * @param array $data
      * @return misc|boolean
      */
-    public function getAttribute($key) 
+    public function getAttribute($key)
     {
         if (!empty($this->attributes[$key])) {
             return $this->attributes[$key];
@@ -106,7 +106,7 @@ public function getAttribute($key)
 
     /**
      * Get all the attributes
-     * 
+     *
      * @return array
      */
     public function getAttributes()
@@ -116,7 +116,7 @@ public function getAttributes()
 
     /**
      * Get the image ID
-     * 
+     *
      * @return string
      */
     public function getId()
@@ -126,7 +126,7 @@ public function getId()
 
     /**
      * Get the Owner ID
-     * 
+     *
      * @return string
      */
     public function getOwnerId()
@@ -136,8 +136,8 @@ public function getOwnerId()
 
     /**
      * Get the name
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getName()
     {
@@ -146,8 +146,8 @@ public function getName()
 
     /**
      * Get the description
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getDescription()
     {
@@ -156,8 +156,8 @@ public function getDescription()
 
     /**
      * Get the platform
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getPlatform()
     {
@@ -166,8 +166,8 @@ public function getPlatform()
 
     /**
      * Get the architecture
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getArchitecture()
     {
diff --git a/lib/Zend/Cloud/Infrastructure/ImageList.php b/lib/Zend/Cloud/Infrastructure/ImageList.php
index 96463a9ee90..7fea82495ea 100644
--- a/lib/Zend/Cloud/Infrastructure/ImageList.php
+++ b/lib/Zend/Cloud/Infrastructure/ImageList.php
@@ -32,7 +32,7 @@ class Zend_Cloud_Infrastructure_ImageList implements Countable, Iterator, ArrayA
 
     /**
      * The Image adapter (if exists)
-     * 
+     *
      * @var object
      */
     protected $adapter;
diff --git a/lib/Zend/Cloud/Infrastructure/Instance.php b/lib/Zend/Cloud/Infrastructure/Instance.php
index 87f1286ee6e..77f70648698 100644
--- a/lib/Zend/Cloud/Infrastructure/Instance.php
+++ b/lib/Zend/Cloud/Infrastructure/Instance.php
@@ -15,7 +15,7 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_Infrastructure_Instance 
+class Zend_Cloud_Infrastructure_Instance
 {
     const STATUS_RUNNING       = 'running';
     const STATUS_STOPPED       = 'stopped';
@@ -56,15 +56,15 @@ class Zend_Cloud_Infrastructure_Instance
 
     /**
      * Instance's attribute
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $attributes;
 
     /**
      * Attributes required for an instance
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $attributeRequired = array(
         self::INSTANCE_ID,
@@ -75,9 +75,9 @@ class Zend_Cloud_Infrastructure_Instance
 
     /**
      * Constructor
-     * 
+     *
      * @param  Adapter $adapter
-     * @param  array $data 
+     * @param  array $data
      * @return void
      */
     public function __construct($adapter, $data = null)
@@ -94,7 +94,7 @@ public function __construct($adapter, $data = null)
                 $data = iterator_to_array($data);
             }
         }
-        
+
         if (empty($data) || !is_array($data)) {
             #require_once 'Zend/Cloud/Infrastructure/Exception.php';
             throw new Zend_Cloud_Infrastructure_Exception("You must pass an array of parameters");
@@ -104,7 +104,7 @@ public function __construct($adapter, $data = null)
             if (empty($data[$key])) {
                 #require_once 'Zend/Cloud/Infrastructure/Exception.php';
                 throw new Zend_Cloud_Infrastructure_Exception(sprintf(
-                    'The param "%s" is a required param for %s', 
+                    'The param "%s" is a required param for %s',
                     $key,
                     __CLASS__
                 ));
@@ -121,7 +121,7 @@ public function __construct($adapter, $data = null)
      * @param array $data
      * @return misc|false
      */
-    public function getAttribute($key) 
+    public function getAttribute($key)
     {
         if (!empty($this->attributes[$key])) {
             return $this->attributes[$key];
@@ -131,7 +131,7 @@ public function getAttribute($key)
 
     /**
      * Get all the attributes
-     * 
+     *
      * @return array
      */
     public function getAttributes()
@@ -141,8 +141,8 @@ public function getAttributes()
 
     /**
      * Get the instance's id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getId()
     {
@@ -151,8 +151,8 @@ public function getId()
 
     /**
      * Get the instance's image id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getImageId()
     {
@@ -161,8 +161,8 @@ public function getImageId()
 
     /**
      * Get the instance's name
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getName()
     {
@@ -171,8 +171,8 @@ public function getName()
 
     /**
      * Get the status of the instance
-     * 
-     * @return string|boolean 
+     *
+     * @return string|boolean
      */
     public function getStatus()
     {
@@ -181,9 +181,9 @@ public function getStatus()
 
     /**
      * Wait for status $status with a timeout of $timeout seconds
-     * 
+     *
      * @param  string $status
-     * @param  integer $timeout 
+     * @param  integer $timeout
      * @return boolean
      */
     public function waitStatus($status, $timeout = Adapter::TIMEOUT_STATUS_CHANGE)
@@ -193,8 +193,8 @@ public function waitStatus($status, $timeout = Adapter::TIMEOUT_STATUS_CHANGE)
 
     /**
      * Get the public DNS of the instance
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getPublicDns()
     {
@@ -206,7 +206,7 @@ public function getPublicDns()
 
     /**
      * Get the instance's CPU
-     * 
+     *
      * @return string
      */
     public function getCpu()
@@ -216,7 +216,7 @@ public function getCpu()
 
     /**
      * Get the instance's RAM size
-     * 
+     *
      * @return string
      */
     public function getRamSize()
@@ -226,7 +226,7 @@ public function getRamSize()
 
     /**
      * Get the instance's storage size
-     * 
+     *
      * @return string
      */
     public function getStorageSize()
@@ -236,8 +236,8 @@ public function getStorageSize()
 
     /**
      * Get the instance's zone
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getZone()
     {
@@ -246,7 +246,7 @@ public function getZone()
 
     /**
      * Get the instance's launch time
-     * 
+     *
      * @return string
      */
     public function getLaunchTime()
@@ -256,8 +256,8 @@ public function getLaunchTime()
 
     /**
      * Reboot the instance
-     * 
-     * @return boolean 
+     *
+     * @return boolean
      */
     public function reboot()
     {
@@ -266,8 +266,8 @@ public function reboot()
 
     /**
      * Stop the instance
-     * 
-     * @return boolean 
+     *
+     * @return boolean
      */
     public function stop()
     {
@@ -276,8 +276,8 @@ public function stop()
 
     /**
      * Start the instance
-     * 
-     * @return boolean 
+     *
+     * @return boolean
      */
     public function start()
     {
@@ -286,8 +286,8 @@ public function start()
 
     /**
      * Destroy the instance
-     * 
-     * @return boolean 
+     *
+     * @return boolean
      */
     public function destroy()
     {
@@ -296,11 +296,11 @@ public function destroy()
 
     /**
      * Return the system informations about the $metric of an instance
-     * 
+     *
      * @param  string $metric
      * @param  null|array $options
      * @return array|boolean
-     */ 
+     */
     public function monitor($metric, $options = null)
     {
         return $this->adapter->monitorInstance($this->attributes[self::INSTANCE_ID], $metric, $options);
diff --git a/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php b/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php
index 7e807d35da3..bdc69c2557f 100644
--- a/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php
+++ b/lib/Zend/Cloud/StorageService/Adapter/Rackspace.php
@@ -38,7 +38,7 @@ class Zend_Cloud_StorageService_Adapter_Rackspace
     const API_KEY             = 'key';
     const REMOTE_CONTAINER    = 'container';
     const DELETE_METADATA_KEY = 'ZF_metadata_deleted';
-    
+
     /**
      * The Rackspace adapter
      * @var Zend_Service_Rackspace_Files
@@ -50,7 +50,7 @@ class Zend_Cloud_StorageService_Adapter_Rackspace
      * @var string
      */
     protected $_container = 'default';
-    
+
     /**
      * Constructor
      *
@@ -72,13 +72,13 @@ function __construct($options = array())
         } catch (Zend_Service_Rackspace_Exception $e) {
             throw new Zend_Cloud_StorageService_Exception('Error on create: '.$e->getMessage(), $e->getCode(), $e);
         }
-        
+
         if (isset($options[self::HTTP_ADAPTER])) {
             $this->_rackspace->getHttpClient()->setAdapter($options[self::HTTP_ADAPTER]);
         }
         if (!empty($options[self::REMOTE_CONTAINER])) {
             $this->_container = $options[self::REMOTE_CONTAINER];
-        }    
+        }
     }
 
      /**
@@ -103,7 +103,7 @@ public function fetchItem($path, $options = null)
 
     /**
      * Store an item in the storage service.
-     * 
+     *
      * @param  string $destinationPath
      * @param  mixed $data
      * @param  array $options
@@ -164,18 +164,18 @@ public function moveItem($sourcePath, $destinationPath, $options = null)
             $this->copyItem($sourcePath, $destinationPath, $options);
         } catch (Zend_Service_Rackspace_Exception $e) {
             throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage());
-        }    
+        }
         try {
             $this->deleteItem($sourcePath);
         } catch (Zend_Service_Rackspace_Exception $e) {
             $this->deleteItem($destinationPath);
             throw new Zend_Cloud_StorageService_Exception('Error on move: '.$e->getMessage());
-        }    
+        }
     }
 
     /**
      * Rename an item in the storage service to a given name.
-     * 
+     *
      * @param  string $path
      * @param  string $name
      * @param  array $options
@@ -206,7 +206,7 @@ public function fetchMetadata($path, $options = null)
             $metadata =  $result['metadata'];
         }
         // delete the self::DELETE_METADATA_KEY - this is a trick to remove all
-        // the metadata information of an object (see deleteMetadata). 
+        // the metadata information of an object (see deleteMetadata).
         // Rackspace doesn't have an API to remove the metadata of an object
         unset($metadata[self::DELETE_METADATA_KEY]);
         return $metadata;
@@ -279,7 +279,7 @@ private function getAllFolders($path, &$resultArray)
             $options = array (
                 'prefix'    => $path
             );
-        }    
+        }
         $files = $this->_rackspace->getObjects($this->_container,$options);
         if (!$this->_rackspace->isSuccessful()) {
             throw new Zend_Cloud_StorageService_Exception('Error on get all folders: '.$this->_rackspace->getErrorMsg());
@@ -305,8 +305,8 @@ public function listItems($path, $options = null)
             $options = array (
                 'prefix'    => $path
             );
-        }   
-        
+        }
+
         $files = $this->_rackspace->getObjects($this->_container,$options);
         if (!$this->_rackspace->isSuccessful()) {
             throw new Zend_Cloud_StorageService_Exception('Error on list items: '.$this->_rackspace->getErrorMsg());
@@ -316,7 +316,7 @@ public function listItems($path, $options = null)
             foreach ($files as $file) {
                 $resultArray[] = $file->getName();
             }
-        }    
+        }
         return $resultArray;
     }
 
diff --git a/lib/Zend/Cloud/StorageService/Factory.php b/lib/Zend/Cloud/StorageService/Factory.php
index cbc7d7e1f47..1c4dad255d7 100644
--- a/lib/Zend/Cloud/StorageService/Factory.php
+++ b/lib/Zend/Cloud/StorageService/Factory.php
@@ -50,7 +50,7 @@ private function __construct()
      * Retrieve StorageService adapter
      *
      * @param  array $options
-     * @return Zend_Cloud_StorageService_Adapter 
+     * @return Zend_Cloud_StorageService_Adapter
      */
     public static function getAdapter($options = array())
     {
diff --git a/lib/Zend/CodeGenerator/Php/File.php b/lib/Zend/CodeGenerator/Php/File.php
index 0a585290aae..be742c4b6df 100644
--- a/lib/Zend/CodeGenerator/Php/File.php
+++ b/lib/Zend/CodeGenerator/Php/File.php
@@ -430,7 +430,7 @@ public function generate()
             foreach ($classes as $class) {
                 if($this->getDocblock() == $class->getDocblock()) {
                     $class->setDocblock(null);
-                }                   
+                }
                 $regex = str_replace('?', $class->getName(), self::$_markerClass);
                 $regex = preg_quote($regex, '#');
                 if (preg_match('#'.$regex.'#', $output)) {
diff --git a/lib/Zend/Config/Xml.php b/lib/Zend/Config/Xml.php
index ec74775e40a..ceef39eb0a6 100644
--- a/lib/Zend/Config/Xml.php
+++ b/lib/Zend/Config/Xml.php
@@ -64,7 +64,7 @@ class Zend_Config_Xml extends Zend_Config
      *
      * Note that the keys in $section will override any keys of the same
      * name in the sections that have been included via "extends".
-     * 
+     *
      * The $options parameter may be provided as either a boolean or an array.
      * If provided as a boolean, this sets the $allowModifications option of
      * Zend_Config. If provided as an array, there are two configuration
@@ -77,7 +77,7 @@ class Zend_Config_Xml extends Zend_Config
      *
      * @param  string        $xml     XML file or string to process
      * @param  mixed         $section Section to process
-     * @param  array|boolean $options 
+     * @param  array|boolean $options
      * @throws Zend_Config_Exception When xml is not set or cannot be loaded
      * @throws Zend_Config_Exception When section $sectionName cannot be found in $xml
      */
diff --git a/lib/Zend/Config/Yaml.php b/lib/Zend/Config/Yaml.php
index 7cfc8d62679..b11a407330a 100644
--- a/lib/Zend/Config/Yaml.php
+++ b/lib/Zend/Config/Yaml.php
@@ -202,7 +202,7 @@ public function __construct($yaml, $section = null, $options = false)
                 if (!isset($config[$sectionName])) {
                     #require_once 'Zend/Config/Exception.php';
                     throw new Zend_Config_Exception(sprintf(
-                        'Section "%s" cannot be found', 
+                        'Section "%s" cannot be found',
                         implode(' ', (array)$section)
                     ));
                 }
@@ -214,7 +214,7 @@ public function __construct($yaml, $section = null, $options = false)
             if (!isset($config[$section])) {
                 #require_once 'Zend/Config/Exception.php';
                 throw new Zend_Config_Exception(sprintf(
-                    'Section "%s" cannot be found', 
+                    'Section "%s" cannot be found',
                     implode(' ', (array)$section)
                 ));
             }
diff --git a/lib/Zend/Controller/Action/Helper/FlashMessenger.php b/lib/Zend/Controller/Action/Helper/FlashMessenger.php
index 792ae87373f..307606aef9e 100644
--- a/lib/Zend/Controller/Action/Helper/FlashMessenger.php
+++ b/lib/Zend/Controller/Action/Helper/FlashMessenger.php
@@ -112,10 +112,10 @@ public function setNamespace($namespace = 'default')
         $this->_namespace = $namespace;
         return $this;
     }
-    
+
     /**
      * getNamespace() - return the current namepsace
-     * 
+     *
      * @return string
      */
     public function getNamespace()
@@ -145,7 +145,7 @@ public function addMessage($message, $namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if (self::$_messageAdded === false) {
             self::$_session->setExpirationHops(1, null, true);
         }
@@ -170,7 +170,7 @@ public function hasMessages($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         return isset(self::$_messages[$namespace]);
     }
 
@@ -184,7 +184,7 @@ public function getMessages($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if ($this->hasMessages($namespace)) {
             return self::$_messages[$namespace];
         }
@@ -202,7 +202,7 @@ public function clearMessages($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if ($this->hasMessages($namespace)) {
             unset(self::$_messages[$namespace]);
             return true;
@@ -222,7 +222,7 @@ public function hasCurrentMessages($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         return isset(self::$_session->{$namespace});
     }
 
@@ -237,7 +237,7 @@ public function getCurrentMessages($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if ($this->hasCurrentMessages($namespace)) {
             return self::$_session->{$namespace};
         }
@@ -255,7 +255,7 @@ public function clearCurrentMessages($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if ($this->hasCurrentMessages($namespace)) {
             unset(self::$_session->{$namespace});
             return true;
@@ -274,7 +274,7 @@ public function getIterator($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if ($this->hasMessages($namespace)) {
             return new ArrayObject($this->getMessages($namespace));
         }
@@ -292,7 +292,7 @@ public function count($namespace = null)
         if (!is_string($namespace) || $namespace == '') {
             $namespace = $this->getNamespace();
         }
-        
+
         if ($this->hasMessages($namespace)) {
             return count($this->getMessages($namespace));
         }
diff --git a/lib/Zend/Controller/Action/Helper/ViewRenderer.php b/lib/Zend/Controller/Action/Helper/ViewRenderer.php
index e598011924d..b56f755e984 100644
--- a/lib/Zend/Controller/Action/Helper/ViewRenderer.php
+++ b/lib/Zend/Controller/Action/Helper/ViewRenderer.php
@@ -626,7 +626,7 @@ public function getViewScript($action = null, array $vars = array())
         } elseif (null !== $action) {
             $vars['action'] = $action;
         }
-        
+
         $replacePattern = array('/[^a-z0-9]+$/i', '/^[^a-z0-9]+/i');
         $vars['action'] = preg_replace($replacePattern, '', $vars['action']);
 
diff --git a/lib/Zend/Controller/Plugin/ErrorHandler.php b/lib/Zend/Controller/Plugin/ErrorHandler.php
index 4cac5c2359f..41859620913 100644
--- a/lib/Zend/Controller/Plugin/ErrorHandler.php
+++ b/lib/Zend/Controller/Plugin/ErrorHandler.php
@@ -211,7 +211,7 @@ public function preDispatch(Zend_Controller_Request_Abstract $request)
     {
         $this->_handleError($request);
     }
-	
+
     /**
      * Post dispatch hook -- check for exceptions and dispatch error handler if
      * necessary
diff --git a/lib/Zend/Controller/Request/Http.php b/lib/Zend/Controller/Request/Http.php
index 721d35865a6..3c4eeacd1f5 100644
--- a/lib/Zend/Controller/Request/Http.php
+++ b/lib/Zend/Controller/Request/Http.php
@@ -390,10 +390,10 @@ public function getEnv($key = null, $default = null)
     public function setRequestUri($requestUri = null)
     {
         if ($requestUri === null) {
-            if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { 
+            if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
                 // IIS with Microsoft Rewrite Module
                 $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
-            } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { 
+            } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
                 // IIS with ISAPI_Rewrite
                 $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
             } elseif (
@@ -619,16 +619,16 @@ public function setPathInfo($pathInfo = null)
             $baseUrl = $this->getBaseUrl(); // this actually calls setBaseUrl() & setRequestUri()
             $baseUrlRaw = $this->getBaseUrl(false);
             $baseUrlEncoded = urlencode($baseUrlRaw);
-        
+
             if (null === ($requestUri = $this->getRequestUri())) {
                 return $this;
             }
-        
+
             // Remove the query string from REQUEST_URI
             if ($pos = strpos($requestUri, '?')) {
                 $requestUri = substr($requestUri, 0, $pos);
             }
-            
+
             if (!empty($baseUrl) || !empty($baseUrlRaw)) {
                 if (strpos($requestUri, $baseUrl) === 0) {
                     $pathInfo = substr($requestUri, strlen($baseUrl));
@@ -642,7 +642,7 @@ public function setPathInfo($pathInfo = null)
             } else {
                 $pathInfo = $requestUri;
             }
-        
+
         }
 
         $this->_pathInfo = (string) $pathInfo;
diff --git a/lib/Zend/Crypt/Rsa.php b/lib/Zend/Crypt/Rsa.php
index f69cc0bd787..ee29410eae6 100644
--- a/lib/Zend/Crypt/Rsa.php
+++ b/lib/Zend/Crypt/Rsa.php
@@ -203,9 +203,9 @@ public function decrypt($data, Zend_Crypt_Rsa_Key $key, $format = null)
 
     /**
      * @param  array $configargs
-     * 
+     *
      * @throws Zend_Crypt_Rsa_Exception
-     * 
+     *
      * @return ArrayObject
      */
     public function generateKeys(array $configargs = null)
diff --git a/lib/Zend/Date/DateObject.php b/lib/Zend/Date/DateObject.php
index 9bffb4ae979..5628429ee11 100644
--- a/lib/Zend/Date/DateObject.php
+++ b/lib/Zend/Date/DateObject.php
@@ -313,10 +313,10 @@ protected function date($format, $timestamp = null, $gmt = false)
 
         if (abs($timestamp) <= 0x7FFFFFFF) {
             // See ZF-11992
-            // "o" will sometimes resolve to the previous year (see 
-            // http://php.net/date ; it's part of the ISO 8601 
-            // standard). However, this is not desired, so replacing 
-            // all occurrences of "o" not preceded by a backslash 
+            // "o" will sometimes resolve to the previous year (see
+            // http://php.net/date ; it's part of the ISO 8601
+            // standard). However, this is not desired, so replacing
+            // all occurrences of "o" not preceded by a backslash
             // with "Y"
             $format = preg_replace('/(?<!\\\\)o/', 'Y', $format);
             $result = ($gmt) ? @gmdate($format, $timestamp) : @date($format, $timestamp);
diff --git a/lib/Zend/Db/Adapter/Pdo/Mysql.php b/lib/Zend/Db/Adapter/Pdo/Mysql.php
index a0e0268b9a4..055a7a26987 100644
--- a/lib/Zend/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Zend/Db/Adapter/Pdo/Mysql.php
@@ -88,7 +88,7 @@ protected function _dsn()
         }
         return $dsn;
     }
-    
+
     /**
      * Creates a PDO object and connects to the database.
      *
diff --git a/lib/Zend/Db/Adapter/Sqlsrv.php b/lib/Zend/Db/Adapter/Sqlsrv.php
index ff6bf7929f2..a221714c391 100644
--- a/lib/Zend/Db/Adapter/Sqlsrv.php
+++ b/lib/Zend/Db/Adapter/Sqlsrv.php
@@ -438,7 +438,7 @@ public function describeTable($tableName, $schemaName = null)
         $sql    = "exec sp_columns @table_name = " . $this->quoteIdentifier($tableName, true);
         $stmt   = $this->query($sql);
         $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-        
+
         // ZF-7698
         $stmt->closeCursor();
 
diff --git a/lib/Zend/Db/Statement.php b/lib/Zend/Db/Statement.php
index ca811babd91..88380b731f1 100644
--- a/lib/Zend/Db/Statement.php
+++ b/lib/Zend/Db/Statement.php
@@ -180,7 +180,7 @@ protected function _stripQuoted($sql)
         // get the character for value quoting
         // this should be '
         $q = $this->_adapter->quote('a');
-        $q = $q[0];        
+        $q = $q[0];
         // get the value used as an escaped quote,
         // e.g. \' or ''
         $qe = $this->_adapter->quote($q);
@@ -193,7 +193,7 @@ protected function _stripQuoted($sql)
             // this segfaults only after 65,000 characters instead of 9,000
             $sql = preg_replace("/$q([^$q{$escapeChar}]*|($qe)*)*$q/s", '', $sql);
         }
-        
+
         // get a version of the SQL statement with all quoted
         // values and delimited identifiers stripped out
         // remove "foo\"bar"
diff --git a/lib/Zend/Db/Statement/Sqlsrv.php b/lib/Zend/Db/Statement/Sqlsrv.php
index 6d0a010eaff..c2464165d0a 100644
--- a/lib/Zend/Db/Statement/Sqlsrv.php
+++ b/lib/Zend/Db/Statement/Sqlsrv.php
@@ -376,7 +376,7 @@ public function nextRowset()
             #require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
             throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors());
         }
-        
+
         // reset column keys
         $this->_keys = null;
 
@@ -411,7 +411,7 @@ public function rowCount()
 
         return $num_rows;
     }
-    
+
     /**
      * Returns an array containing all of the result set rows.
      *
diff --git a/lib/Zend/Dojo/Form/Element/Editor.php b/lib/Zend/Dojo/Form/Element/Editor.php
index 1b15384e31c..b49834924a4 100644
--- a/lib/Zend/Dojo/Form/Element/Editor.php
+++ b/lib/Zend/Dojo/Form/Element/Editor.php
@@ -610,12 +610,12 @@ public function addExtraPlugin($plugin)
         if (in_array($plugin, $extraPlugins)) {
             return $this;
         }
-    
+
         $extraPlugins[] = (string) $plugin;
         $this->setDijitParam('extraPlugins', $extraPlugins);
         return $this;
     }
-    
+
     /**
      * Add multiple extra plugins.
      *
@@ -629,7 +629,7 @@ public function addExtraPlugins(array $plugins)
         }
         return $this;
     }
-    
+
     /**
      * Overwrite many extra plugins at once.
      *
@@ -642,7 +642,7 @@ public function setExtraPlugins(array $plugins)
         $this->addExtraPlugins($plugins);
         return $this;
     }
-    
+
     /**
      * Get all extra plugins.
      *
@@ -655,7 +655,7 @@ public function getExtraPlugins()
         }
         return $this->getDijitParam('extraPlugins');
     }
-    
+
     /**
      * Is a given extra plugin registered?
      *
@@ -667,7 +667,7 @@ public function hasExtraPlugin($plugin)
         $extraPlugins = $this->getExtraPlugins();
         return in_array((string) $plugin, $extraPlugins);
     }
-    
+
     /**
      * Remove a given extra plugin.
      *
@@ -684,7 +684,7 @@ public function removeExtraPlugin($plugin)
         $this->setDijitParam('extraPlugins', $extraPlugins);
         return $this;
     }
-    
+
     /**
      * Clear all extra plugins.
      *
diff --git a/lib/Zend/Dojo/View/Helper/ComboBox.php b/lib/Zend/Dojo/View/Helper/ComboBox.php
index fe7d473318b..cb20ef888d2 100644
--- a/lib/Zend/Dojo/View/Helper/ComboBox.php
+++ b/lib/Zend/Dojo/View/Helper/ComboBox.php
@@ -100,7 +100,7 @@ public function comboBox($id, $value = null, array $params = array(), array $att
             return $html;
         }
 
-        // required for correct type casting in declerative mode 
+        // required for correct type casting in declerative mode
         if (isset($params['autocomplete'])) {
             $params['autocomplete'] = ($params['autocomplete']) ? 'true' : 'false';
         }
diff --git a/lib/Zend/Dojo/View/Helper/Editor.php b/lib/Zend/Dojo/View/Helper/Editor.php
index 4e1d1b1c2ae..1430a02fe30 100644
--- a/lib/Zend/Dojo/View/Helper/Editor.php
+++ b/lib/Zend/Dojo/View/Helper/Editor.php
@@ -132,7 +132,7 @@ public function editor($id, $value = null, $params = array(), $attribs = array()
                . '</noscript>';
 
         $html  .= '<input' . $this->_htmlAttribs($hiddenAttribs) . $this->getClosingBracket();
-        
+
         return $html;
     }
 
diff --git a/lib/Zend/EventManager/Event.php b/lib/Zend/EventManager/Event.php
index 1461b9a55d5..7f9a52c23c7 100644
--- a/lib/Zend/EventManager/Event.php
+++ b/lib/Zend/EventManager/Event.php
@@ -23,7 +23,7 @@
 /**
  * Representation of an event
  *
- * Encapsulates the target context and parameters passed, and provides some 
+ * Encapsulates the target context and parameters passed, and provides some
  * behavior for interacting with the event manager.
  *
  * @category   Zend
@@ -57,10 +57,10 @@ class Zend_EventManager_Event implements Zend_EventManager_EventDescription
      * Constructor
      *
      * Accept a target and its parameters.
-     * 
+     *
      * @param  string $name Event name
-     * @param  string|object $target 
-     * @param  array|ArrayAccess $params 
+     * @param  string|object $target
+     * @param  array|ArrayAccess $params
      * @return void
      */
     public function __construct($name = null, $target = null, $params = null)
@@ -80,7 +80,7 @@ public function __construct($name = null, $target = null, $params = null)
 
     /**
      * Get event name
-     * 
+     *
      * @return string
      */
     public function getName()
@@ -92,7 +92,7 @@ public function getName()
      * Get the event target
      *
      * This may be either an object, or the name of a static method.
-     * 
+     *
      * @return string|object
      */
     public function getTarget()
@@ -104,8 +104,8 @@ public function getTarget()
      * Set parameters
      *
      * Overwrites parameters
-     * 
-     * @param  array|ArrayAccess|object $params 
+     *
+     * @param  array|ArrayAccess|object $params
      * @return Event
      */
     public function setParams($params)
@@ -124,7 +124,7 @@ public function setParams($params)
 
     /**
      * Get all parameters
-     * 
+     *
      * @return array|object|ArrayAccess
      */
     public function getParams()
@@ -136,9 +136,9 @@ public function getParams()
      * Get an individual parameter
      *
      * If the parameter does not exist, the $default value will be returned.
-     * 
-     * @param  string|int $name 
-     * @param  mixed $default 
+     *
+     * @param  string|int $name
+     * @param  mixed $default
      * @return mixed
      */
     public function getParam($name, $default = null)
@@ -161,8 +161,8 @@ public function getParam($name, $default = null)
 
     /**
      * Set the event name
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return Zend_EventManager_Event
      */
     public function setName($name)
@@ -173,8 +173,8 @@ public function setName($name)
 
     /**
      * Set the event target/context
-     * 
-     * @param  null|string|object $target 
+     *
+     * @param  null|string|object $target
      * @return Zend_EventManager_Event
      */
     public function setTarget($target)
@@ -185,9 +185,9 @@ public function setTarget($target)
 
     /**
      * Set an individual parameter to a value
-     * 
-     * @param  string|int $name 
-     * @param  mixed $value 
+     *
+     * @param  string|int $name
+     * @param  mixed $value
      * @return Zend_EventManager_Event
      */
     public function setParam($name, $value)
@@ -204,8 +204,8 @@ public function setParam($name, $value)
 
     /**
      * Stop further event propagation
-     * 
-     * @param  bool $flag 
+     *
+     * @param  bool $flag
      * @return void
      */
     public function stopPropagation($flag = true)
@@ -215,7 +215,7 @@ public function stopPropagation($flag = true)
 
     /**
      * Is propagation stopped?
-     * 
+     *
      * @return bool
      */
     public function propagationIsStopped()
diff --git a/lib/Zend/EventManager/EventCollection.php b/lib/Zend/EventManager/EventCollection.php
index 70d1787c90d..c664a54ab62 100644
--- a/lib/Zend/EventManager/EventCollection.php
+++ b/lib/Zend/EventManager/EventCollection.php
@@ -40,11 +40,11 @@ interface Zend_EventManager_EventCollection
      * - Passing event name, target, and array|ArrayAccess of arguments
      *
      * Can emulate triggerUntil() if the last argument provided is a callback.
-     * 
-     * @param  string $event 
-     * @param  object|string $target 
-     * @param  array|object $argv 
-     * @param  null|callback $callback 
+     *
+     * @param  string $event
+     * @param  object|string $target
+     * @param  array|object $argv
+     * @param  null|callback $callback
      * @return Zend_EventManager_ResponseCollection
      */
     public function trigger($event, $target = null, $argv = array(), $callback = null);
@@ -57,19 +57,19 @@ public function trigger($event, $target = null, $argv = array(), $callback = nul
      * - Passing event name, Event object, and callback only
      * - Passing event name, target, Event object, and callback
      * - Passing event name, target, array|ArrayAccess of arguments, and callback
-     * 
-     * @param  string $event 
-     * @param  object|string $target 
-     * @param  array|object $argv 
-     * @param  callback $callback 
+     *
+     * @param  string $event
+     * @param  object|string $target
+     * @param  array|object $argv
+     * @param  callback $callback
      * @return Zend_EventManager_ResponseCollection
      */
     public function triggerUntil($event, $target, $argv = null, $callback = null);
 
     /**
      * Attach a listener to an event
-     * 
-     * @param  string $event 
+     *
+     * @param  string $event
      * @param  callback $callback
      * @param  int $priority Priority at which to register listener
      * @return Zend_Stdlib_CallbackHandler
@@ -78,31 +78,31 @@ public function attach($event, $callback = null, $priority = 1);
 
     /**
      * Detach an event listener
-     * 
-     * @param  Zend_Stdlib_CallbackHandler|Zend_EventManager_ListenerAggregate $listener 
+     *
+     * @param  Zend_Stdlib_CallbackHandler|Zend_EventManager_ListenerAggregate $listener
      * @return void
      */
     public function detach($listener);
 
     /**
      * Get a list of events for which this collection has listeners
-     * 
+     *
      * @return array
      */
     public function getEvents();
 
     /**
      * Retrieve a list of listeners registered to a given event
-     * 
-     * @param  string $event 
+     *
+     * @param  string $event
      * @return array|object
      */
     public function getListeners($event);
 
     /**
      * Clear all listeners for a given event
-     * 
-     * @param  string $event 
+     *
+     * @param  string $event
      * @return void
      */
     public function clearListeners($event);
diff --git a/lib/Zend/EventManager/EventDescription.php b/lib/Zend/EventManager/EventDescription.php
index 2c6bca23bc9..7a6f7beb8b5 100644
--- a/lib/Zend/EventManager/EventDescription.php
+++ b/lib/Zend/EventManager/EventDescription.php
@@ -30,29 +30,29 @@ interface Zend_EventManager_EventDescription
 {
     /**
      * Get event name
-     * 
+     *
      * @return string
      */
     public function getName();
 
     /**
      * Get target/context from which event was triggered
-     * 
+     *
      * @return null|string|object
      */
     public function getTarget();
 
     /**
      * Get parameters passed to the event
-     * 
+     *
      * @return array|ArrayAccess
      */
     public function getParams();
 
     /**
      * Get a single parameter by name
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @param  mixed $default Default value to return if parameter does not exist
      * @return mixed
      */
@@ -60,48 +60,48 @@ public function getParam($name, $default = null);
 
     /**
      * Set the event name
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return void
      */
     public function setName($name);
 
     /**
      * Set the event target/context
-     * 
-     * @param  null|string|object $target 
+     *
+     * @param  null|string|object $target
      * @return void
      */
     public function setTarget($target);
 
     /**
      * Set event parameters
-     * 
-     * @param  string $params 
+     *
+     * @param  string $params
      * @return void
      */
     public function setParams($params);
 
     /**
      * Set a single parameter by key
-     * 
-     * @param  string $name 
-     * @param  mixed $value 
+     *
+     * @param  string $name
+     * @param  mixed $value
      * @return void
      */
     public function setParam($name, $value);
 
     /**
      * Indicate whether or not the parent EventCollection should stop propagating events
-     * 
-     * @param  bool $flag 
+     *
+     * @param  bool $flag
      * @return void
      */
     public function stopPropagation($flag = true);
 
     /**
      * Has this event indicated event propagation should stop?
-     * 
+     *
      * @return bool
      */
     public function propagationIsStopped();
diff --git a/lib/Zend/EventManager/EventManager.php b/lib/Zend/EventManager/EventManager.php
index ff34ca057c1..a850c4474a0 100644
--- a/lib/Zend/EventManager/EventManager.php
+++ b/lib/Zend/EventManager/EventManager.php
@@ -105,7 +105,7 @@ public function setSharedCollections(Zend_EventManager_SharedEventCollection $co
      *
      * Sets {@link $sharedCollections} to boolean false to disable ability
      * to lazy-load static event manager instance.
-     * 
+     *
      * @return void
      */
     public function unsetSharedCollections()
@@ -261,7 +261,7 @@ public function triggerUntil($event, $target, $argv = null, $callback = null)
      * executed. By default, this value is 1; however, you may set it for any
      * integer value. Higher values have higher priority (i.e., execute first).
      *
-     * You can specify "*" for the event name. In such cases, the listener will 
+     * You can specify "*" for the event name. In such cases, the listener will
      * be triggered for every event.
      *
      * @param  string|array|Zend_EventManager_ListenerAggregate $event An event or array of event names. If a ListenerAggregate, proxies to {@link attachAggregate()}.
@@ -525,9 +525,9 @@ protected function getSharedListeners($event)
      * Add listeners to the master queue of listeners
      *
      * Used to inject shared listeners and wildcard listeners.
-     * 
-     * @param  Zend_Stdlib_PriorityQueue $masterListeners 
-     * @param  Zend_Stdlib_PriorityQueue $listeners 
+     *
+     * @param  Zend_Stdlib_PriorityQueue $masterListeners
+     * @param  Zend_Stdlib_PriorityQueue $listeners
      * @return void
      */
     protected function insertListeners($masterListeners, $listeners)
diff --git a/lib/Zend/EventManager/EventManagerAware.php b/lib/Zend/EventManager/EventManagerAware.php
index e1a9b33f81b..d77cfd4fb7d 100644
--- a/lib/Zend/EventManager/EventManagerAware.php
+++ b/lib/Zend/EventManager/EventManagerAware.php
@@ -32,8 +32,8 @@ interface Zend_EventManager_EventManagerAware
 {
     /**
      * Inject an EventManager instance
-     * 
-     * @param  Zend_EventManager_EventCollection $eventManager 
+     *
+     * @param  Zend_EventManager_EventCollection $eventManager
      * @return void
      */
     public function setEventManager(Zend_EventManager_EventCollection $eventManager);
diff --git a/lib/Zend/EventManager/Filter.php b/lib/Zend/EventManager/Filter.php
index 7243560bbd1..192cc7a28fe 100644
--- a/lib/Zend/EventManager/Filter.php
+++ b/lib/Zend/EventManager/Filter.php
@@ -32,46 +32,46 @@ interface Zend_EventManager_Filter
 {
     /**
      * Execute the filter chain
-     * 
-     * @param  string|object $context 
-     * @param  array $params 
+     *
+     * @param  string|object $context
+     * @param  array $params
      * @return mixed
      */
     public function run($context, array $params = array());
 
     /**
      * Attach an intercepting filter
-     * 
-     * @param  callback $callback 
+     *
+     * @param  callback $callback
      * @return Zend_Stdlib_CallbackHandler
      */
     public function attach($callback);
 
     /**
      * Detach an intercepting filter
-     * 
-     * @param  Zend_Stdlib_CallbackHandler $filter 
+     *
+     * @param  Zend_Stdlib_CallbackHandler $filter
      * @return bool
      */
     public function detach(Zend_Stdlib_CallbackHandler $filter);
 
     /**
      * Get all intercepting filters
-     * 
+     *
      * @return array
      */
     public function getFilters();
 
     /**
      * Clear all filters
-     * 
+     *
      * @return void
      */
     public function clearFilters();
 
     /**
      * Get all filter responses
-     * 
+     *
      * @return Zend_EventManager_ResponseCollection
      */
     public function getResponses();
diff --git a/lib/Zend/EventManager/Filter/FilterIterator.php b/lib/Zend/EventManager/Filter/FilterIterator.php
index e960da9139a..24353ddcf59 100644
--- a/lib/Zend/EventManager/Filter/FilterIterator.php
+++ b/lib/Zend/EventManager/Filter/FilterIterator.php
@@ -22,7 +22,7 @@
 #require_once 'Zend/Stdlib/SplPriorityQueue.php';
 
 /**
- * Specialized priority queue implementation for use with an intercepting 
+ * Specialized priority queue implementation for use with an intercepting
  * filter chain.
  *
  * Allows removal
@@ -36,8 +36,8 @@ class Zend_EventManager_Filter_FilterIterator extends Zend_Stdlib_SplPriorityQue
 {
     /**
      * Does the queue contain a given value?
-     * 
-     * @param  mixed $datum 
+     *
+     * @param  mixed $datum
      * @return bool
      */
     public function contains($datum)
@@ -56,8 +56,8 @@ public function contains($datum)
      *
      * This is an expensive operation. It must first iterate through all values,
      * and then re-populate itself. Use only if absolutely necessary.
-     * 
-     * @param  mixed $datum 
+     *
+     * @param  mixed $datum
      * @return bool
      */
     public function remove($datum)
diff --git a/lib/Zend/EventManager/FilterChain.php b/lib/Zend/EventManager/FilterChain.php
index 77289f59467..daf51899d25 100644
--- a/lib/Zend/EventManager/FilterChain.php
+++ b/lib/Zend/EventManager/FilterChain.php
@@ -41,7 +41,7 @@ class Zend_EventManager_FilterChain implements Zend_EventManager_Filter
      * Constructor
      *
      * Initializes Zend_EventManager_Filter_FilterIterator in which filters will be aggregated
-     * 
+     *
      * @return void
      */
     public function __construct()
@@ -53,7 +53,7 @@ public function __construct()
      * Apply the filters
      *
      * Begins iteration of the filters.
-     * 
+     *
      * @param  mixed $context Object under observation
      * @param  mixed $argv Associative array of arguments
      * @return mixed
@@ -95,8 +95,8 @@ public function attach($callback, $priority = 1)
 
     /**
      * Detach a filter from the chain
-     * 
-     * @param  Zend_Stdlib_CallbackHandler $filter 
+     *
+     * @param  Zend_Stdlib_CallbackHandler $filter
      * @return bool Returns true if filter found and unsubscribed; returns false otherwise
      */
     public function detach(Zend_Stdlib_CallbackHandler $filter)
@@ -106,7 +106,7 @@ public function detach(Zend_Stdlib_CallbackHandler $filter)
 
     /**
      * Retrieve all filters
-     * 
+     *
      * @return Zend_EventManager_Filter_FilterIterator
      */
     public function getFilters()
@@ -116,7 +116,7 @@ public function getFilters()
 
     /**
      * Clear all filters
-     * 
+     *
      * @return void
      */
     public function clearFilters()
@@ -127,9 +127,9 @@ public function clearFilters()
     /**
      * Return current responses
      *
-     * Only available while the chain is still being iterated. Returns the 
+     * Only available while the chain is still being iterated. Returns the
      * current ResponseCollection.
-     * 
+     *
      * @return null|Zend_EventManager_ResponseCollection
      */
     public function getResponses()
diff --git a/lib/Zend/EventManager/GlobalEventManager.php b/lib/Zend/EventManager/GlobalEventManager.php
index 581f8d95ea6..376dafbce2b 100644
--- a/lib/Zend/EventManager/GlobalEventManager.php
+++ b/lib/Zend/EventManager/GlobalEventManager.php
@@ -24,7 +24,7 @@
 /**
  * Event manager: notification system
  *
- * Use the EventManager when you want to create a per-instance notification 
+ * Use the EventManager when you want to create a per-instance notification
  * system for your objects.
  *
  * @category   Zend
@@ -41,8 +41,8 @@ class Zend_EventManager_GlobalEventManager
 
     /**
      * Set the event collection on which this will operate
-     * 
-     * @param  null|Zend_EventManager_EventCollection $events 
+     *
+     * @param  null|Zend_EventManager_EventCollection $events
      * @return void
      */
     public static function setEventCollection(Zend_EventManager_EventCollection $events = null)
@@ -65,10 +65,10 @@ public static function getEventCollection()
 
     /**
      * Trigger an event
-     * 
-     * @param  string $event 
-     * @param  object|string $context 
-     * @param  array|object $argv 
+     *
+     * @param  string $event
+     * @param  object|string $context
+     * @param  array|object $argv
      * @return Zend_EventManager_ResponseCollection
      */
     public static function trigger($event, $context, $argv = array())
@@ -77,13 +77,13 @@ public static function trigger($event, $context, $argv = array())
     }
 
     /**
-     * Trigger listeenrs until return value of one causes a callback to evaluate 
+     * Trigger listeenrs until return value of one causes a callback to evaluate
      * to true.
-     * 
-     * @param  string $event 
-     * @param  string|object $context 
-     * @param  array|object $argv 
-     * @param  callback $callback 
+     *
+     * @param  string $event
+     * @param  string|object $context
+     * @param  array|object $argv
+     * @param  callback $callback
      * @return Zend_EventManager_ResponseCollection
      */
     public static function triggerUntil($event, $context, $argv, $callback)
@@ -93,10 +93,10 @@ public static function triggerUntil($event, $context, $argv, $callback)
 
     /**
      * Attach a listener to an event
-     * 
-     * @param  string $event 
-     * @param  callback $callback 
-     * @param  int $priority 
+     *
+     * @param  string $event
+     * @param  callback $callback
+     * @param  int $priority
      * @return Zend_Stdlib_CallbackHandler
      */
     public static function attach($event, $callback, $priority = 1)
@@ -106,8 +106,8 @@ public static function attach($event, $callback, $priority = 1)
 
     /**
      * Detach a callback from a listener
-     * 
-     * @param  Zend_Stdlib_CallbackHandler $listener 
+     *
+     * @param  Zend_Stdlib_CallbackHandler $listener
      * @return bool
      */
     public static function detach(Zend_Stdlib_CallbackHandler $listener)
@@ -117,7 +117,7 @@ public static function detach(Zend_Stdlib_CallbackHandler $listener)
 
     /**
      * Retrieve list of events this object manages
-     * 
+     *
      * @return array
      */
     public static function getEvents()
@@ -127,8 +127,8 @@ public static function getEvents()
 
     /**
      * Retrieve all listeners for a given event
-     * 
-     * @param  string $event 
+     *
+     * @param  string $event
      * @return Zend_Stdlib_PriorityQueue|array
      */
     public static function getListeners($event)
@@ -138,8 +138,8 @@ public static function getListeners($event)
 
     /**
      * Clear all listeners for a given event
-     * 
-     * @param  string $event 
+     *
+     * @param  string $event
      * @return void
      */
     public static function clearListeners($event)
diff --git a/lib/Zend/EventManager/ResponseCollection.php b/lib/Zend/EventManager/ResponseCollection.php
index 6ef9d9aa18b..6aa75fdb136 100644
--- a/lib/Zend/EventManager/ResponseCollection.php
+++ b/lib/Zend/EventManager/ResponseCollection.php
@@ -38,22 +38,22 @@ class SplStack implements Iterator, ArrayAccess, Countable
         protected $mode = self::IT_MODE_KEEP;
 
         /**
-         * Count of elements in the stack 
-         * 
+         * Count of elements in the stack
+         *
          * @var int
          */
         protected $count = 0;
 
         /**
          * Data represented by this stack
-         * 
+         *
          * @var array
          */
         protected $data = array();
 
         /**
          * Sorted stack of values
-         * 
+         *
          * @var false|array
          */
         protected $stack = false;
@@ -62,9 +62,9 @@ class SplStack implements Iterator, ArrayAccess, Countable
          * Set the iterator mode
          *
          * Must be set to one of IT_MODE_DELETE or IT_MODE_KEEP
-         * 
+         *
          * @todo   Currently, IteratorMode is ignored, as we use the default (keep); should this be implemented?
-         * @param  int $mode 
+         * @param  int $mode
          * @return void
          * @throws InvalidArgumentException
          */
@@ -84,7 +84,7 @@ public function setIteratorMode($mode)
 
         /**
          * Return last element in the stack
-         * 
+         *
          * @return mixed
          */
         public function bottom()
@@ -97,7 +97,7 @@ public function bottom()
 
         /**
          * Countable: return count of items in the stack
-         * 
+         *
          * @return int
          */
         public function count()
@@ -107,7 +107,7 @@ public function count()
 
         /**
          * Iterator: return current item in the stack
-         * 
+         *
          * @return mixed
          */
         public function current()
@@ -120,7 +120,7 @@ public function current()
 
         /**
          * Get iteration mode
-         * 
+         *
          * @return int
          */
         public function getIteratorMode()
@@ -153,7 +153,7 @@ public function key()
 
         /**
          * Iterator: advance pointer to next item in the stack
-         * 
+         *
          * @return void
          */
         public function next()
@@ -166,8 +166,8 @@ public function next()
 
         /**
          * ArrayAccess: does an item exist at the specified offset?
-         * 
-         * @param  mixed $index 
+         *
+         * @param  mixed $index
          * @return bool
          */
         public function offsetExists($index)
@@ -177,8 +177,8 @@ public function offsetExists($index)
 
         /**
          * ArrayAccess: get the item at the specified offset
-         * 
-         * @param  mixed $index 
+         *
+         * @param  mixed $index
          * @return mixed
          * @throws OutOfRangeException
          */
@@ -192,9 +192,9 @@ public function offsetGet($index)
 
         /**
          * ArrayAccess: add an item at the specified offset
-         * 
-         * @param  mixed $index 
-         * @param  mixed $newval 
+         *
+         * @param  mixed $index
+         * @param  mixed $newval
          * @return void
          */
         public function offsetSet($index, $newval)
@@ -206,8 +206,8 @@ public function offsetSet($index, $newval)
 
         /**
          * ArrayAccess: unset the item at the specified offset
-         * 
-         * @param  mixed $index 
+         *
+         * @param  mixed $index
          * @return void
          * @throws OutOfRangeException
          */
@@ -247,8 +247,8 @@ public function prev()
 
         /**
          * Push an element to the list
-         * 
-         * @param  mixed $value 
+         *
+         * @param  mixed $value
          * @return void
          */
         public function push($value)
@@ -260,7 +260,7 @@ public function push($value)
 
         /**
          * Iterator: rewind to beginning of stack
-         * 
+         *
          * @return void
          */
         public function rewind()
@@ -297,7 +297,7 @@ public function shift()
 
         /**
          * Peek at the top node of the stack
-         * 
+         *
          * @return mixed
          */
         public function top()
@@ -332,7 +332,7 @@ public function unshift($value)
             $this->count++;
             $this->stack  = false;
         }
-        
+
         /**
          * Iterator: is the current pointer valid?
          *
@@ -355,13 +355,13 @@ public function valid()
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_EventManager_ResponseCollection extends SplStack 
+class Zend_EventManager_ResponseCollection extends SplStack
 {
     protected $stopped = false;
 
     /**
      * Did the last response provided trigger a short circuit of the stack?
-     * 
+     *
      * @return bool
      */
     public function stopped()
@@ -371,8 +371,8 @@ public function stopped()
 
     /**
      * Mark the collection as stopped (or its opposite)
-     * 
-     * @param  bool $flag 
+     *
+     * @param  bool $flag
      * @return Zend_EventManager_ResponseCollection
      */
     public function setStopped($flag)
diff --git a/lib/Zend/EventManager/SharedEventCollectionAware.php b/lib/Zend/EventManager/SharedEventCollectionAware.php
index 4a624d05a70..7bf533a0572 100644
--- a/lib/Zend/EventManager/SharedEventCollectionAware.php
+++ b/lib/Zend/EventManager/SharedEventCollectionAware.php
@@ -34,8 +34,8 @@ interface Zend_EventManager_SharedEventCollectionAware
 {
     /**
      * Inject an EventManager instance
-     * 
-     * @param  Zend_EventManager_SharedEventCollection $sharedEventCollection 
+     *
+     * @param  Zend_EventManager_SharedEventCollection $sharedEventCollection
      * @return Zend_EventManager_SharedEventCollectionAware
      */
     public function setSharedCollections(Zend_EventManager_SharedEventCollection $sharedEventCollection);
diff --git a/lib/Zend/EventManager/SharedEventManager.php b/lib/Zend/EventManager/SharedEventManager.php
index 875b0a10420..18b73a739ad 100644
--- a/lib/Zend/EventManager/SharedEventManager.php
+++ b/lib/Zend/EventManager/SharedEventManager.php
@@ -25,7 +25,7 @@
  * Shared/contextual EventManager
  *
  * Allows attaching to EMs composed by other classes without having an instance first.
- * The assumption is that the SharedEventManager will be injected into EventManager 
+ * The assumption is that the SharedEventManager will be injected into EventManager
  * instances, and then queried for additional listeners when triggering an event.
  *
  * @category   Zend
@@ -44,8 +44,8 @@ class Zend_EventManager_SharedEventManager implements Zend_EventManager_SharedEv
     /**
      * Attach a listener to an event
      *
-     * Allows attaching a callback to an event offerred by one or more 
-     * identifying components. As an example, the following connects to the 
+     * Allows attaching a callback to an event offerred by one or more
+     * identifying components. As an example, the following connects to the
      * "getAll" event of both an AbstractResource and EntityResource:
      *
      * <code>
@@ -63,9 +63,9 @@ class Zend_EventManager_SharedEventManager implements Zend_EventManager_SharedEv
      *     }
      * );
      * </code>
-     * 
+     *
      * @param  string|array $id Identifier(s) for event emitting component(s)
-     * @param  string $event 
+     * @param  string $event
      * @param  callback $callback PHP Callback
      * @param  int $priority Priority at which listener should execute
      * @return void
@@ -83,9 +83,9 @@ public function attach($id, $event, $callback, $priority = 1)
 
     /**
      * Detach a listener from an event offered by a given resource
-     * 
+     *
      * @param  string|int $id
-     * @param  Zend_Stdlib_CallbackHandler $listener 
+     * @param  Zend_Stdlib_CallbackHandler $listener
      * @return bool Returns true if event and listener found, and unsubscribed; returns false if either event or listener not found
      */
     public function detach($id, Zend_Stdlib_CallbackHandler $listener)
@@ -98,7 +98,7 @@ public function detach($id, Zend_Stdlib_CallbackHandler $listener)
 
     /**
      * Retrieve all registered events for a given resource
-     * 
+     *
      * @param  string|int $id
      * @return array
      */
@@ -112,9 +112,9 @@ public function getEvents($id)
 
     /**
      * Retrieve all listeners for a given identifier and event
-     * 
+     *
      * @param  string|int $id
-     * @param  string|int $event 
+     * @param  string|int $event
      * @return false|Zend_Stdlib_PriorityQueue
      */
     public function getListeners($id, $event)
@@ -127,9 +127,9 @@ public function getListeners($id, $event)
 
     /**
      * Clear all listeners for a given identifier, optionally for a specific event
-     * 
-     * @param  string|int $id 
-     * @param  null|string $event 
+     *
+     * @param  string|int $id
+     * @param  null|string $event
      * @return bool
      */
     public function clearListeners($id, $event = null)
diff --git a/lib/Zend/EventManager/StaticEventManager.php b/lib/Zend/EventManager/StaticEventManager.php
index 54442d3bb99..850e0c042ba 100644
--- a/lib/Zend/EventManager/StaticEventManager.php
+++ b/lib/Zend/EventManager/StaticEventManager.php
@@ -39,7 +39,7 @@ class Zend_EventManager_StaticEventManager extends Zend_EventManager_SharedEvent
 
     /**
      * Singleton
-     * 
+     *
      * @return void
      */
     protected function __construct()
@@ -57,7 +57,7 @@ private function __clone()
 
     /**
      * Retrieve instance
-     * 
+     *
      * @return Zend_EventManager_StaticEventManager
      */
     public static function getInstance()
@@ -70,7 +70,7 @@ public static function getInstance()
 
     /**
      * Reset the singleton instance
-     * 
+     *
      * @return void
      */
     public static function resetInstance()
diff --git a/lib/Zend/Feed/Abstract.php b/lib/Zend/Feed/Abstract.php
index f8089689e1d..afc9b720f04 100644
--- a/lib/Zend/Feed/Abstract.php
+++ b/lib/Zend/Feed/Abstract.php
@@ -263,8 +263,8 @@ abstract public function send();
      * Import a feed from a string
      *
      * Protects against XXE attack vectors.
-     * 
-     * @param  string $feed 
+     *
+     * @param  string $feed
      * @return string
      * @throws Zend_Feed_Exception on detection of an XXE vector
      */
diff --git a/lib/Zend/Feed/Reader.php b/lib/Zend/Feed/Reader.php
index 27b8af0738d..bd3961936a3 100644
--- a/lib/Zend/Feed/Reader.php
+++ b/lib/Zend/Feed/Reader.php
@@ -341,8 +341,8 @@ public static function importString($string)
     {
         $dom = new DOMDocument;
         try {
-            $dom = Zend_Xml_Security::scan($string, $dom);        
-        } catch (Zend_Xml_Exception $e) {    
+            $dom = Zend_Xml_Security::scan($string, $dom);
+        } catch (Zend_Xml_Exception $e) {
             #require_once 'Zend/Feed/Exception.php';
             throw new Zend_Feed_Exception(
                 $e->getMessage()
diff --git a/lib/Zend/Filter/File/Rename.php b/lib/Zend/Filter/File/Rename.php
index 273486b5d29..bc0667b232b 100644
--- a/lib/Zend/Filter/File/Rename.php
+++ b/lib/Zend/Filter/File/Rename.php
@@ -142,11 +142,11 @@ public function addFile($options)
     public function getNewName($value, $source = false)
     {
         $file = $this->_getFileName($value);
-        
+
         if (!is_array($file) || !array_key_exists('source', $file) || !array_key_exists('target', $file)) {
             return $value;
         }
-        
+
         if ($file['source'] == $file['target']) {
             return $value;
         }
diff --git a/lib/Zend/Filter/Input.php b/lib/Zend/Filter/Input.php
index fe5eb14f870..7bb885581fa 100644
--- a/lib/Zend/Filter/Input.php
+++ b/lib/Zend/Filter/Input.php
@@ -801,8 +801,8 @@ protected function _validate()
             $this->_data = array();
             return;
         }
-        
-        // remember the default not empty message in case we want to temporarily change it        
+
+        // remember the default not empty message in case we want to temporarily change it
         $preserveDefaultNotEmptyMessage = $this->_defaults[self::NOT_EMPTY_MESSAGE];
 
         foreach ($this->_validatorRules as $ruleName => &$validatorRule) {
@@ -840,14 +840,14 @@ protected function _validate()
             }
             if (!isset($validatorRule[self::ALLOW_EMPTY])) {
                 $foundNotEmptyValidator = false;
-                
+
                 foreach ($validatorRule as $rule) {
                     if ($rule === 'NotEmpty') {
                         $foundNotEmptyValidator = true;
                         // field may not be empty, we are ready
                         break 1;
                     }
-                    
+
                     if (is_array($rule)) {
                         $keys      = array_keys($rule);
                         $classKey  = array_shift($keys);
@@ -866,14 +866,14 @@ protected function _validate()
                         // it cannot be a NotEmpty validator, skip this one
                         continue;
                     }
-                    
+
                     if($rule instanceof Zend_Validate_NotEmpty) {
                         $foundNotEmptyValidator = true;
                         // field may not be empty, we are ready
                         break 1;
                     }
                 }
-                
+
                 if (!$foundNotEmptyValidator) {
                     $validatorRule[self::ALLOW_EMPTY] = $this->_defaults[self::ALLOW_EMPTY];
                 } else {
@@ -923,7 +923,7 @@ protected function _validate()
                             /** we are changing the defaults here, this is alright if all subsequent validators are also a not empty
                             * validator, but it goes wrong if one of them is not AND is required!!!
                             * that is why we restore the default value at the end of this loop
-                            */ 
+                            */
                             if (is_array($value)) {
                                 $temp = $value; // keep the original value
                                 $this->_defaults[self::NOT_EMPTY_MESSAGE] = array_pop($temp);
@@ -951,11 +951,11 @@ protected function _validate()
             } else {
                 $this->_validateRule($validatorRule);
             }
-            
+
             // reset the default not empty message
             $this->_defaults[self::NOT_EMPTY_MESSAGE] = $preserveDefaultNotEmptyMessage;
         }
-        
+
 
 
         /**
@@ -1035,8 +1035,8 @@ protected function _validateRule(array $validatorRule)
                     if (!($notEmptyValidator = $this->_getNotEmptyValidatorInstance($validatorRule))) {
                         $notEmptyValidator = $this->_getValidator('NotEmpty');
                         $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldKey));
-                    }            
-                            
+                    }
+
                     if (!$notEmptyValidator->isValid($field)) {
                         foreach ($notEmptyValidator->getMessages() as $messageKey => $message) {
                             if (!isset($messages[$messageKey])) {
@@ -1078,7 +1078,7 @@ protected function _validateRule(array $validatorRule)
                 $notEmptyValidator = $this->_getValidator('NotEmpty');
                 $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldName));
             }
-            
+
             if ($validatorRule[self::ALLOW_EMPTY]) {
                 $validatorChain = $validatorRule[self::VALIDATOR_CHAIN];
             } else {
@@ -1136,10 +1136,10 @@ protected function _validateRule(array $validatorRule)
             }
         }
     }
-    
+
     /**
      * Check a validatorRule for the presence of a NotEmpty validator instance.
-     * The purpose is to preserve things like a custom message, that may have been 
+     * The purpose is to preserve things like a custom message, that may have been
      * set on the validator outside Zend_Filter_Input.
      * @param array $validatorRule
      * @return mixed false if none is found, Zend_Validate_NotEmpty instance if found
@@ -1150,7 +1150,7 @@ protected function _getNotEmptyValidatorInstance($validatorRule) {
                 return $value;
             }
         }
-        
+
         return false;
     }
 
diff --git a/lib/Zend/Form/Decorator/Captcha/ReCaptcha.php b/lib/Zend/Form/Decorator/Captcha/ReCaptcha.php
index ab5cfec2975..1db25e474e5 100644
--- a/lib/Zend/Form/Decorator/Captcha/ReCaptcha.php
+++ b/lib/Zend/Form/Decorator/Captcha/ReCaptcha.php
@@ -25,7 +25,7 @@
 /**
  * ReCaptcha-based captcha decorator
  *
- * Adds hidden fields for challenge and response input, and JS for populating 
+ * Adds hidden fields for challenge and response input, and JS for populating
  * from known recaptcha IDs
  *
  * @category   Zend
@@ -77,7 +77,7 @@ public function render($content)
         ));
 
         // Create a window.onload event so that we can bind to the form.
-        // Once bound, add an onsubmit event that will replace the hidden field 
+        // Once bound, add an onsubmit event that will replace the hidden field
         // values with those produced by ReCaptcha
         // zendBindEvent mediates between Mozilla's addEventListener and
         // IE's sole support for addEvent.
@@ -94,7 +94,7 @@ function windowOnLoad(fn) {
 }
 function zendBindEvent(el, eventName, eventHandler) {
     if (el.addEventListener){
-        el.addEventListener(eventName, eventHandler, false); 
+        el.addEventListener(eventName, eventHandler, false);
     } else if (el.attachEvent){
         el.attachEvent('on'+eventName, eventHandler);
     }
@@ -106,13 +106,13 @@ function zendBindEvent(el, eventName, eventHandler) {
         function(e) {
             document.getElementById("$challengeId").value = document.getElementById("recaptcha_challenge_field").value;
             document.getElementById("$responseId").value = document.getElementById("recaptcha_response_field").value;
-        }    
+        }
     );
 });
 </script>
 EOJ;
 
-        // Always place the hidden fields before the captcha markup, and follow 
+        // Always place the hidden fields before the captcha markup, and follow
         // with the JS from above
         switch ($placement) {
             case 'PREPEND':
diff --git a/lib/Zend/Form/Decorator/Fieldset.php b/lib/Zend/Form/Decorator/Fieldset.php
index da6143bc1f4..ad9a540cd11 100644
--- a/lib/Zend/Form/Decorator/Fieldset.php
+++ b/lib/Zend/Form/Decorator/Fieldset.php
@@ -26,7 +26,7 @@
  * Zend_Form_Decorator_Fieldset
  *
  * Any options passed will be used as HTML attributes of the fieldset tag.
- * 
+ *
  *
  * @category   Zend
  * @package    Zend_Form
diff --git a/lib/Zend/Form/Element.php b/lib/Zend/Form/Element.php
index 4c5c127b2bc..b7c71b7bbae 100644
--- a/lib/Zend/Form/Element.php
+++ b/lib/Zend/Form/Element.php
@@ -338,8 +338,8 @@ public function loadDefaultDecorators()
      * Used to resolve and return an element ID
      *
      * Passed to the HtmlTag decorator as a callback in order to provide an ID.
-     * 
-     * @param  Zend_Form_Decorator_Interface $decorator 
+     *
+     * @param  Zend_Form_Decorator_Interface $decorator
      * @return string
      */
     public static function resolveElementId(Zend_Form_Decorator_Interface $decorator)
diff --git a/lib/Zend/Form/Element/Note.php b/lib/Zend/Form/Element/Note.php
index c1f430e7c50..6c90ab5e1cb 100644
--- a/lib/Zend/Form/Element/Note.php
+++ b/lib/Zend/Form/Element/Note.php
@@ -40,14 +40,14 @@ class Zend_Form_Element_Note extends Zend_Form_Element_Xhtml
      * @var string
      */
     public $helper = 'formNote';
-    
+
     /**
      * Ignore flag (used when retrieving values at form level)
      *
      * @var bool
      */
     protected $_ignore = true;
-    
+
     /**
      * Validate element value (pseudo)
      *
diff --git a/lib/Zend/Gdata/Analytics.php b/lib/Zend/Gdata/Analytics.php
index ac969e38b25..f0813a98d17 100644
--- a/lib/Zend/Gdata/Analytics.php
+++ b/lib/Zend/Gdata/Analytics.php
@@ -89,7 +89,7 @@ public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.
 
     /**
      * Retrieve account feed object
-     * 
+     *
      * @param string|Zend_Uri_Uri $uri
      * @return Zend_Gdata_Analytics_AccountFeed
      */
@@ -103,7 +103,7 @@ public function getAccountFeed($uri = self::ANALYTICS_ACCOUNT_FEED_URI)
 
     /**
      * Retrieve data feed object
-     * 
+     *
      * @param string|Zend_Uri_Uri $uri
      * @return Zend_Gdata_Analytics_DataFeed
      */
@@ -117,14 +117,14 @@ public function getDataFeed($uri = self::ANALYTICS_FEED_URI)
 
     /**
      * Returns a new DataQuery object.
-     * 
+     *
      * @return Zend_Gdata_Analytics_DataQuery
      */
     public function newDataQuery()
     {
         return new Zend_Gdata_Analytics_DataQuery();
     }
-    
+
     /**
      * Returns a new AccountQuery object.
      *
diff --git a/lib/Zend/Gdata/Analytics/AccountQuery.php b/lib/Zend/Gdata/Analytics/AccountQuery.php
index 0e3a2272dee..9ac6791f097 100644
--- a/lib/Zend/Gdata/Analytics/AccountQuery.php
+++ b/lib/Zend/Gdata/Analytics/AccountQuery.php
@@ -38,7 +38,7 @@ class Zend_Gdata_Analytics_AccountQuery extends Zend_Gdata_Query
      * The default URI used for feeds.
      */
     protected $_defaultFeedUri = self::ANALYTICS_FEED_URI;
-    
+
     /**
      * @var string
      */
@@ -51,10 +51,10 @@ class Zend_Gdata_Analytics_AccountQuery extends Zend_Gdata_Query
      * @var string
      */
     protected $_profileId = '~all';
-   
+
     /**
      * @var bool
-     */ 
+     */
     protected $_webproperties = false;
     /**
      * @var bool
@@ -64,7 +64,7 @@ class Zend_Gdata_Analytics_AccountQuery extends Zend_Gdata_Query
      * @var bool
      */
     protected $_goals = false;
-    
+
     /**
      * @param string $accountId
      * @return Zend_Gdata_Analytics_AccountQuery
@@ -74,7 +74,7 @@ public function setAccountId($accountId)
         $this->_accountId = $accountId;
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -92,7 +92,7 @@ public function setWebpropertyId($webpropertyId)
         $this->_webpropertyId = $webpropertyId;
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -100,7 +100,7 @@ public function getWebpropertyId()
     {
         return $this->_webpropertyId;
     }
-    
+
     /**
      * @param string $profileId
      * @return Zend_Gdata_Analytics_AccountQuery
@@ -118,7 +118,7 @@ public function getProfileId()
     {
         return $this->_profileId;
     }
-    
+
     /**
      * @param string $accountId
      * @return Zend_Gdata_Analytics_AccountQuery
@@ -126,10 +126,10 @@ public function getProfileId()
     public function webproperties($accountId = '~all')
     {
         $this->_webproperties = true;
-        $this->setAccountId($accountId);    
+        $this->setAccountId($accountId);
         return $this;
     }
-    
+
     /**
      * @param string $webpropertyId
      * @param string $accountId
@@ -139,12 +139,12 @@ public function profiles($webpropertyId = '~all', $accountId = '~all')
     {
         $this->_profiles = true;
         if (null !== $accountId) {
-            $this->setAccountId($accountId);    
+            $this->setAccountId($accountId);
         }
         $this->setWebpropertyId($webpropertyId);
         return $this;
     }
-    
+
     /**
      * @param string $webpropertyId
      * @param string $accountId
@@ -155,31 +155,31 @@ public function goals($profileId = '~all', $webpropertyId = '~all', $accountId =
     {
         $this->_goals = true;
         if (null !== $accountId) {
-            $this->setAccountId($accountId);    
+            $this->setAccountId($accountId);
         }
         if (null !== $webpropertyId) {
-            $this->setWebpropertyId($webpropertyId);    
+            $this->setWebpropertyId($webpropertyId);
         }
         $this->setProfileId($profileId);
         return $this;
     }
-    
+
     /**
      * @return string url
      */
     public function getQueryUrl()
     {
         $url = $this->_defaultFeedUri;
-        
+
         // add account id
         if ($this->_webproperties || $this->_profiles || $this->_goals) {
             $url .= '/' . $this->_accountId . '/webproperties';
         }
-        
+
         if ($this->_profiles || $this->_goals) {
             $url .= '/' . $this->_webpropertyId . '/profiles';
         }
-        
+
         if ($this->_goals) {
             $url .= '/' . $this->_profileId . '/goals';
         }
diff --git a/lib/Zend/Gdata/Analytics/DataEntry.php b/lib/Zend/Gdata/Analytics/DataEntry.php
index 0aee206c58f..5a835cd73ab 100644
--- a/lib/Zend/Gdata/Analytics/DataEntry.php
+++ b/lib/Zend/Gdata/Analytics/DataEntry.php
@@ -75,7 +75,7 @@ protected function takeChildFromDOM($child)
     }
 
     /**
-     * @param string $name 
+     * @param string $name
      * @return mixed
      */
     public function getDimension($name)
@@ -87,9 +87,9 @@ public function getDimension($name)
         }
         return null;
     }
-    
-    /** 
-     * @param string $name 
+
+    /**
+     * @param string $name
      * @return mixed
      */
     public function getMetric($name)
@@ -101,9 +101,9 @@ public function getMetric($name)
         }
         return null;
     }
-    
+
     /**
-     * @param string $name 
+     * @param string $name
      * @return mixed
      */
     public function getValue($name)
diff --git a/lib/Zend/Gdata/Analytics/DataQuery.php b/lib/Zend/Gdata/Analytics/DataQuery.php
index e8f96b9a0c3..6e11e6612d9 100644
--- a/lib/Zend/Gdata/Analytics/DataQuery.php
+++ b/lib/Zend/Gdata/Analytics/DataQuery.php
@@ -181,7 +181,7 @@ class Zend_Gdata_Analytics_DataQuery extends Zend_Gdata_Query
     const METRIC_TOTAL_EVENTS = 'ga:totalEvents';
     const METRIC_UNIQUE_EVENTS = 'ga:uniqueEvents';
     const METRIC_EVENT_VALUE = 'ga:eventValue';
-    
+
     // suported filter operators
     const EQUALS = "==";
     const EQUALS_NOT = "!=";
@@ -193,7 +193,7 @@ class Zend_Gdata_Analytics_DataQuery extends Zend_Gdata_Query
     const CONTAINS_NOT ="!@";
     const REGULAR ="=~";
     const REGULAR_NOT ="!~";
-    
+
     /**
      * @var string
      */
@@ -214,7 +214,7 @@ class Zend_Gdata_Analytics_DataQuery extends Zend_Gdata_Query
      * @var array
      */
     protected $_filters = array();
-    
+
     /**
      * @param string $id
      * @return Zend_Gdata_Analytics_DataQuery
@@ -239,7 +239,7 @@ public function getProfileId()
      */
     public function addDimension($dimension)
     {
-        $this->_dimensions[$dimension] = true;        
+        $this->_dimensions[$dimension] = true;
         return $this;
     }
 
@@ -305,7 +305,7 @@ public function setEndDate($date)
         $this->setParam("end-date", $date);
         return $this;
     }
-    
+
     /**
      * @param string $filter
      * @return Zend_Gdata_Analytics_DataQuery
@@ -315,7 +315,7 @@ public function addFilter($filter)
         $this->_filters[] = array($filter, true);
         return $this;
     }
-    
+
     /**
      * @param string $filter
      * @return Zend_Gdata_Analytics_DataQuery
@@ -325,7 +325,7 @@ public function addOrFilter($filter)
         $this->_filters[] = array($filter, false);
         return $this;
     }
-    
+
     /**
      * @param string $sort
      * @param boolean[optional] $descending
@@ -337,7 +337,7 @@ public function addSort($sort, $descending=false)
         $this->_sort[] = ($descending?'-':'').$sort;
         return $this;
     }
-    
+
     /**
      * @return Zend_Gdata_Analytics_DataQuery
      */
@@ -346,7 +346,7 @@ public function clearSort()
         $this->_sort = array();
         return $this;
     }
-    
+
     /**
      * @param string $segment
      * @return Zend_Gdata_Analytics_DataQuery
@@ -366,37 +366,37 @@ public function getQueryUrl()
         if (isset($this->_url)) {
             $uri = $this->_url;
         }
-        
+
         $dimensions = $this->getDimensions();
         if (!empty($dimensions)) {
             $this->setParam('dimensions', implode(",", array_keys($dimensions)));
         }
-        
+
         $metrics = $this->getMetrics();
         if (!empty($metrics)) {
             $this->setParam('metrics', implode(",", array_keys($metrics)));
         }
-        
+
         // profile id (ga:tableId)
         if ($this->getProfileId() != null) {
             $this->setParam('ids', 'ga:'.ltrim($this->getProfileId(), "ga:"));
         }
-                
+
         // sorting
         if ($this->_sort) {
             $this->setParam('sort', implode(",", $this->_sort));
         }
-        
+
         // filtering
         $filters = "";
         foreach ($this->_filters as $filter) {
             $filters.=($filter[1]===true?';':',').$filter[0];
         }
-        
+
         if ($filters!="") {
             $this->setParam('filters', ltrim($filters, ",;"));
         }
-        
+
         $uri .= $this->getQueryString();
         return $uri;
     }
diff --git a/lib/Zend/Gdata/Analytics/Extension/Dimension.php b/lib/Zend/Gdata/Analytics/Extension/Dimension.php
index 44e3ef95cec..2b53a00f288 100644
--- a/lib/Zend/Gdata/Analytics/Extension/Dimension.php
+++ b/lib/Zend/Gdata/Analytics/Extension/Dimension.php
@@ -30,7 +30,7 @@
  * @package    Zend_Gdata
  * @subpackage Analytics
  */
-class Zend_Gdata_Analytics_Extension_Dimension 
+class Zend_Gdata_Analytics_Extension_Dimension
     extends Zend_Gdata_Analytics_Extension_Metric
 {
     protected $_rootNamespace = 'ga';
diff --git a/lib/Zend/Gdata/Analytics/Extension/Goal.php b/lib/Zend/Gdata/Analytics/Extension/Goal.php
index b9ff1e168da..2b955d6896e 100644
--- a/lib/Zend/Gdata/Analytics/Extension/Goal.php
+++ b/lib/Zend/Gdata/Analytics/Extension/Goal.php
@@ -40,7 +40,7 @@ public function __construct()
         $this->registerAllNamespaces(Zend_Gdata_Analytics::$namespaces);
         parent::__construct();
     }
-    
+
     /**
      * @return string
      */
diff --git a/lib/Zend/Gdata/Analytics/Extension/Metric.php b/lib/Zend/Gdata/Analytics/Extension/Metric.php
index 07840361a1d..2f8aca5fd16 100644
--- a/lib/Zend/Gdata/Analytics/Extension/Metric.php
+++ b/lib/Zend/Gdata/Analytics/Extension/Metric.php
@@ -30,7 +30,7 @@
  * @package    Zend_Gdata
  * @subpackage Analytics
  */
-class Zend_Gdata_Analytics_Extension_Metric 
+class Zend_Gdata_Analytics_Extension_Metric
     extends Zend_Gdata_Analytics_Extension_Property
 {
     protected $_rootNamespace = 'ga';
diff --git a/lib/Zend/Gdata/Gbase/Entry.php b/lib/Zend/Gdata/Gbase/Entry.php
index fb5f081a304..13c94f41291 100644
--- a/lib/Zend/Gdata/Gbase/Entry.php
+++ b/lib/Zend/Gdata/Gbase/Entry.php
@@ -54,6 +54,6 @@ public function __construct($element = null)
             'Google Base API has been discontinued by Google and was removed'
             . ' from Zend Framework in 1.12.0.  For more information see: '
             . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
-        );    
+        );
     }
 }
diff --git a/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php
index d37d93f284f..e0e1799dc22 100644
--- a/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php
+++ b/lib/Zend/Gdata/Gbase/Extension/BaseAttribute.php
@@ -49,6 +49,6 @@ public function __construct($name = null, $text = null, $type = null)
             'Google Base API has been discontinued by Google and was removed'
             . ' from Zend Framework in 1.12.0.  For more information see: '
             . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
-        );    
+        );
     }
 }
diff --git a/lib/Zend/Gdata/Gbase/Feed.php b/lib/Zend/Gdata/Gbase/Feed.php
index 8b6be12274c..0297ddaa763 100644
--- a/lib/Zend/Gdata/Gbase/Feed.php
+++ b/lib/Zend/Gdata/Gbase/Feed.php
@@ -56,6 +56,6 @@ public function __construct($element = null)
             'Google Base API has been discontinued by Google and was removed'
             . ' from Zend Framework in 1.12.0.  For more information see: '
             . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
-        );    
+        );
     }
 }
diff --git a/lib/Zend/Gdata/Gbase/Query.php b/lib/Zend/Gdata/Gbase/Query.php
index 2d8cf5eb74a..e5e158f3e1c 100644
--- a/lib/Zend/Gdata/Gbase/Query.php
+++ b/lib/Zend/Gdata/Gbase/Query.php
@@ -64,6 +64,6 @@ public function __construct($url = null)
             'Google Base API has been discontinued by Google and was removed'
             . ' from Zend Framework in 1.12.0.  For more information see: '
             . 'http://googlemerchantblog.blogspot.ca/2010/12/new-shopping-apis-and-deprecation-of.html'
-        );    
+        );
     }
 }
diff --git a/lib/Zend/Gdata/Health/Query.php b/lib/Zend/Gdata/Health/Query.php
index 1e047a2a93a..6cc815cfa1a 100644
--- a/lib/Zend/Gdata/Health/Query.php
+++ b/lib/Zend/Gdata/Health/Query.php
@@ -60,7 +60,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query
      * Namespace for an item category
      */
     const ITEM_CATEGORY_NS = 'http://schemas.google.com/health/item';
-    
+
     /**
      * Create Gdata_Query object
      */
diff --git a/lib/Zend/Http/Client/Adapter/Proxy.php b/lib/Zend/Http/Client/Adapter/Proxy.php
index 658fa60bac6..ddf11489855 100644
--- a/lib/Zend/Http/Client/Adapter/Proxy.php
+++ b/lib/Zend/Http/Client/Adapter/Proxy.php
@@ -75,10 +75,10 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
      * @var boolean
      */
     protected $negotiated = false;
-    
+
     /**
      * Stores the last CONNECT handshake request
-     * 
+     *
      * @var string
      */
     protected $connectHandshakeRequest;
@@ -261,7 +261,7 @@ protected function connectHandshake(
             }
         }
         $request .= "\r\n";
-        
+
         // @see ZF-3189
         $this->connectHandshakeRequest = $request;
 
diff --git a/lib/Zend/Json.php b/lib/Zend/Json.php
index 9715430cb4b..7d9514c57dc 100644
--- a/lib/Zend/Json.php
+++ b/lib/Zend/Json.php
@@ -283,7 +283,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu
                 }
                 if (!empty($value)) {
                     $attributes['@text'] = $value;
-                } 
+                }
                 return array($name => $attributes);
             } else {
                return array($name => $value);
@@ -364,7 +364,7 @@ public static function fromXml($xmlStringContents, $ignoreXmlAttributes=true)
         return($jsonStringOutput);
     }
 
-    
+
 
     /**
      * Pretty-print JSON string
@@ -428,9 +428,9 @@ public static function prettyPrint($json, $options = array())
                 $result .= $token . $lineBreak;
             } else {
                 $result .= ( $inLiteral ? '' : $prefix ) . $token;
-                
+
                 // Count # of unescaped double-quotes in token, subtract # of
-                // escaped double-quotes and if the result is odd then we are 
+                // escaped double-quotes and if the result is odd then we are
                 // inside a string literal
                 if ((substr_count($token, "\"")-substr_count($token, "\\\"")) % 2 != 0) {
                     $inLiteral = !$inLiteral;
diff --git a/lib/Zend/Loader.php b/lib/Zend/Loader.php
index 318d7557e4e..0eaf0c4332d 100644
--- a/lib/Zend/Loader.php
+++ b/lib/Zend/Loader.php
@@ -338,6 +338,6 @@ public static function standardiseFile($file)
             $file      = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
         }
         $file .= str_replace('_', DIRECTORY_SEPARATOR, $fileName) . '.php';
-        return $file;    
+        return $file;
     }
 }
diff --git a/lib/Zend/Loader/AutoloaderFactory.php b/lib/Zend/Loader/AutoloaderFactory.php
index 5f676e3526a..2ea6357ab19 100644
--- a/lib/Zend/Loader/AutoloaderFactory.php
+++ b/lib/Zend/Loader/AutoloaderFactory.php
@@ -38,7 +38,7 @@ abstract class Zend_Loader_AutoloaderFactory
     protected static $loaders = array();
 
     /**
-     * @var Zend_Loader_StandardAutoloader StandardAutoloader instance for resolving 
+     * @var Zend_Loader_StandardAutoloader StandardAutoloader instance for resolving
      * autoloader classes via the include_path
      */
     protected static $standardAutoloader;
@@ -107,7 +107,7 @@ public static function factory($options = null)
                 if (!class_exists($class) && !$autoloader->autoload($class)) {
                     #require_once 'Exception/InvalidArgumentException.php';
                     throw new Zend_Loader_Exception_InvalidArgumentException(sprintf(
-                        'Autoloader class "%s" not loaded', 
+                        'Autoloader class "%s" not loaded',
                         $class
                     ));
                 }
@@ -118,7 +118,7 @@ public static function factory($options = null)
                         if (!is_subclass_of($class, 'Zend_Loader_SplAutoloader')) {
                         #require_once 'Exception/InvalidArgumentException.php';
                         throw new Zend_Loader_Exception_InvalidArgumentException(sprintf(
-                            'Autoloader class %s must implement Zend\\Loader\\SplAutoloader', 
+                            'Autoloader class %s must implement Zend\\Loader\\SplAutoloader',
                             $class
                         ));
                     }
@@ -200,10 +200,10 @@ public static function unregisterAutoloader($autoloaderClass)
     /**
      * Get an instance of the standard autoloader
      *
-     * Used to attempt to resolve autoloader classes, using the 
-     * StandardAutoloader. The instance is marked as a fallback autoloader, to 
+     * Used to attempt to resolve autoloader classes, using the
+     * StandardAutoloader. The instance is marked as a fallback autoloader, to
      * allow resolving autoloaders not under the "Zend" or "Zend" namespaces.
-     * 
+     *
      * @return Zend_Loader_SplAutoloader
      */
     protected static function getStandardAutoloader()
diff --git a/lib/Zend/Loader/ClassMapAutoloader.php b/lib/Zend/Loader/ClassMapAutoloader.php
index 2823bf04054..d9aa55e6f48 100644
--- a/lib/Zend/Loader/ClassMapAutoloader.php
+++ b/lib/Zend/Loader/ClassMapAutoloader.php
@@ -25,7 +25,7 @@
  * Class-map autoloader
  *
  * Utilizes class-map files to lookup classfile locations.
- * 
+ *
  * @package    Zend_Loader
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
@@ -48,8 +48,8 @@ class Zend_Loader_ClassMapAutoloader implements Zend_Loader_SplAutoloader
      * Constructor
      *
      * Create a new instance, and optionally configure the autoloader.
-     * 
-     * @param  null|array|Traversable $options 
+     *
+     * @param  null|array|Traversable $options
      * @return void
      */
     public function __construct($options = null)
@@ -63,8 +63,8 @@ public function __construct($options = null)
      * Configure the autoloader
      *
      * Proxies to {@link registerAutoloadMaps()}.
-     * 
-     * @param  array|Traversable $options 
+     *
+     * @param  array|Traversable $options
      * @return Zend_Loader_ClassMapAutoloader
      */
     public function setOptions($options)
@@ -79,10 +79,10 @@ public function setOptions($options)
      * An autoload map may be either an associative array, or a file returning
      * an associative array.
      *
-     * An autoload map should be an associative array containing 
+     * An autoload map should be an associative array containing
      * classname/file pairs.
-     * 
-     * @param  string|array $location 
+     *
+     * @param  string|array $location
      * @return Zend_Loader_ClassMapAutoloader
      */
     public function registerAutoloadMap($map)
@@ -110,8 +110,8 @@ public function registerAutoloadMap($map)
 
     /**
      * Register many autoload maps at once
-     * 
-     * @param  array $locations 
+     *
+     * @param  array $locations
      * @return Zend_Loader_ClassMapAutoloader
      */
     public function registerAutoloadMaps($locations)
@@ -128,7 +128,7 @@ public function registerAutoloadMaps($locations)
 
     /**
      * Retrieve current autoload map
-     * 
+     *
      * @return array
      */
     public function getAutoloadMap()
@@ -138,8 +138,8 @@ public function getAutoloadMap()
 
     /**
      * Defined by Autoloadable
-     * 
-     * @param  string $class 
+     *
+     * @param  string $class
      * @return void
      */
     public function autoload($class)
@@ -151,7 +151,7 @@ public function autoload($class)
 
     /**
      * Register the autoloader with spl_autoload registry
-     * 
+     *
      * @return void
      */
     public function register()
@@ -169,8 +169,8 @@ public function register()
      * If the map has been previously loaded, returns the current instance;
      * otherwise, returns whatever was returned by calling include() on the
      * location.
-     * 
-     * @param  string $location 
+     *
+     * @param  string $location
      * @return Zend_Loader_ClassMapAutoloader|mixed
      * @throws Zend_Loader_Exception_InvalidArgumentException for nonexistent locations
      */
@@ -198,8 +198,8 @@ protected function loadMapFromFile($location)
     /**
      * Resolve the real_path() to a file within a phar.
      *
-     * @see    https://bugs.php.net/bug.php?id=52769 
-     * @param  string $path 
+     * @see    https://bugs.php.net/bug.php?id=52769
+     * @param  string $path
      * @return string
      */
     public static function realPharPath($path)
@@ -207,7 +207,7 @@ public static function realPharPath($path)
         if (strpos($path, 'phar:///') !== 0) {
             return;
         }
-        
+
         $parts = explode('/', str_replace(array('/','\\'), '/', substr($path, 8)));
         $parts = array_values(array_filter($parts, array(__CLASS__, 'concatPharParts')));
 
@@ -220,8 +220,8 @@ public static function realPharPath($path)
 
     /**
      * Helper callback for filtering phar paths
-     * 
-     * @param  string $part 
+     *
+     * @param  string $part
      * @return bool
      */
     public static function concatPharParts($part)
@@ -231,10 +231,10 @@ public static function concatPharParts($part)
 
     /**
      * Helper callback to resolve a parent path in a Phar archive
-     * 
-     * @param  string $value 
-     * @param  int $key 
-     * @param  array $parts 
+     *
+     * @param  string $value
+     * @param  int $key
+     * @param  array $parts
      * @return void
      */
     public static function resolvePharParentPath($value, $key, &$parts)
diff --git a/lib/Zend/Loader/SplAutoloader.php b/lib/Zend/Loader/SplAutoloader.php
index f502f8f035b..e1b9815d3f2 100644
--- a/lib/Zend/Loader/SplAutoloader.php
+++ b/lib/Zend/Loader/SplAutoloader.php
@@ -21,7 +21,7 @@
 if (interface_exists('Zend_Loader_SplAutoloader')) return;
 
 /**
- * Defines an interface for classes that may register with the spl_autoload 
+ * Defines an interface for classes that may register with the spl_autoload
  * registry
  *
  * @package    Zend_Loader
@@ -34,8 +34,8 @@ interface Zend_Loader_SplAutoloader
      * Constructor
      *
      * Allow configuration of the autoloader via the constructor.
-     * 
-     * @param  null|array|Traversable $options 
+     *
+     * @param  null|array|Traversable $options
      * @return void
      */
     public function __construct($options = null);
@@ -43,10 +43,10 @@ public function __construct($options = null);
     /**
      * Configure the autoloader
      *
-     * In most cases, $options should be either an associative array or 
+     * In most cases, $options should be either an associative array or
      * Traversable object.
-     * 
-     * @param  array|Traversable $options 
+     *
+     * @param  array|Traversable $options
      * @return SplAutoloader
      */
     public function setOptions($options);
@@ -68,7 +68,7 @@ public function autoload($class);
      * <code>
      * spl_autoload_register(array($this, 'autoload'));
      * </code>
-     * 
+     *
      * @return void
      */
     public function register();
diff --git a/lib/Zend/Loader/StandardAutoloader.php b/lib/Zend/Loader/StandardAutoloader.php
index 96134dee10a..80703cca5be 100644
--- a/lib/Zend/Loader/StandardAutoloader.php
+++ b/lib/Zend/Loader/StandardAutoloader.php
@@ -263,9 +263,9 @@ public function register()
      *
      * Used by {@link loadClass} during fallback autoloading in PHP versions
      * prior to 5.3.0.
-     * 
-     * @param mixed $errno 
-     * @param mixed $errstr 
+     *
+     * @param mixed $errno
+     * @param mixed $errstr
      * @return void
      */
     public function handleError($errno, $errstr)
diff --git a/lib/Zend/Locale/Data/characters.xml b/lib/Zend/Locale/Data/characters.xml
index ace9566c5b9..7d221d2b98b 100644
--- a/lib/Zend/Locale/Data/characters.xml
+++ b/lib/Zend/Locale/Data/characters.xml
@@ -521,6 +521,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<character value = "￦">
 				<substitute>KRW</substitute>
 			</character>
-		</character-fallback> 
+		</character-fallback>
 	</characters>
 </supplementalData>
diff --git a/lib/Zend/Locale/Data/coverageLevels.xml b/lib/Zend/Locale/Data/coverageLevels.xml
index 298f5f3ae31..255a1948d20 100644
--- a/lib/Zend/Locale/Data/coverageLevels.xml
+++ b/lib/Zend/Locale/Data/coverageLevels.xml
@@ -18,7 +18,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<!--  all other items -->
 			<approvalRequirement votes="4" locales="*" paths=""/>
 		</approvalRequirements>
-		
+
 		<coverageVariable key="%acctPattern" value="[@type='accounting']/pattern[@type='standard']"/>
 		<coverageVariable key="%allPlurals" value="(zero|one|two|few|many|other)"/>
 		<coverageVariable key="%allWidths" value="(wide|abbreviated|narrow)"/>
@@ -74,7 +74,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%medLong" value="(medium|long)"/>
 		<coverageVariable key="%metazone30_AR" value="Argentina(_Western)?"/>
 		<coverageVariable key="%metazone30_AU" value="(Australia_(Central(Western)?|(East|West)ern)|Lord_Howe)"/>
-		<coverageVariable key="%metazone30_AU_stdonly" value="Macquarie"/> 
+		<coverageVariable key="%metazone30_AU_stdonly" value="Macquarie"/>
 		<coverageVariable key="%metazone30_BR" value="(Amazon|Brasilia|Noronha)"/>
 		<coverageVariable key="%metazone30_CA" value="(America_(Eastern|Central|Mountain|Pacific)|Newfoundland)"/>
 		<coverageVariable key="%metazone30_EU" value="Europe_(Central|(East|West)ern)"/>
@@ -84,8 +84,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%metazone30_RU" value="(Europe_Eastern|Moscow|Yekaterinburg|Omsk|Novosibirsk|Krasnoyarsk|Irkutsk|Yakutsk|Vladivostok|Magadan)"/>
 		<coverageVariable key="%metazone30_US" value="(America_(Eastern|Central|Mountain|Pacific)|Alaska|Hawaii_Aleutian)"/>
 		<coverageVariable key="%metazone40" value="(America_(Eastern|Central|Mountain|Pacific)|Europe_(Central|(East|West)ern)|Atlantic)"/>
-		<coverageVariable key="%metazone60" value="(Africa_Western|Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/> 
-		<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/> 
+		<coverageVariable key="%metazone60" value="(Africa_Western|Arabian|Australia_(Central(Western)?|(East|West)ern)|China|Israel|Japan|Korea|Moscow)"/>
+		<coverageVariable key="%metazone60_stdonly" value="(Africa_(Central|(East|South)ern)|India|Indochina|Indonesia_(Central|(East|West)ern))"/>
 		<coverageVariable key="%metazone80" value="(Alaska|Amazon|Argentina(_Western)?|Armenia|Azerbaijan|Azores|Bangladesh|Brasilia|Cape_Verde|Chatham|Chile|Choibalsan|Colombia|Cook|Cuba|Easter|Falkland|Fiji|Georgia|Greenland_(East|West)ern|Hawaii_Aleutian|Hong_Kong|Hovd|Iran|Irkutsk|Krasnoyarsk|Lord_Howe|Magadan|Mauritius|Mexico_(Northwest|Pacific)|Mongolia|New_(Caledonia|Zealand)|Newfoundland|Noronha|Novosibirsk|Omsk|Pakistan|Paraguay|Peru|Philippines|Pierre_Miquelon|Sakhalin|Samoa|Taipei|Tonga|Turkmenistan|Uruguay|Uzbekistan|Vanuatu|Vladivostok|Volgograd|Yakutsk|Yekaterinburg)"/>
 		<coverageVariable key="%metazone80_stdonly" value="(Afghanistan|Bhutan|Bolivia|Brunei|Chamorro|Christmas|Cocos|Davis|DumontDUrville|East_Timor|Ecuador|French_(Guiana|Southern)|Gambier|Galapagos|Gilbert_Islands|Gulf|Guyana|Indian_Ocean|Kazakhstan_(East|West)ern|Kosrae|Kyrgystan|Line_Islands|Macquarie|Malaysia|Maldives|Marquesas|Marshall_Islands|Mawson|Myanmar|Nauru|Nepal|Niue|Norfolk|Palau|Papua_New_Guinea|Phoenix_Islands|Pitcairn|Ponape|Reunion|Rothera|Seychelles|Singapore|Solomon|South_Georgia|Suriname|Syowa|Tahiti|Tajikistan|Tokelau|Truk|Tuvalu|Venezuela|Vostok|Wake|Wallis)"/>
 		<coverageVariable key="%metazone100" value="(Acre|Almaty|Anadyr|Aqtau|Aqtobe|Kamchatka|Macau|Qyzylorda|Samara)"/>
@@ -395,8 +395,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="60" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitDurationTypes']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel value="60" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonMetric']/unitPattern[@count='${Target-Plurals}']"/>
 		<coverageLevel inTerritory="US" value="60" match="units/unitLength[@type='%unitLengths']/unit[@type='%unitsCommonUS']/unitPattern[@count='${Target-Plurals}']"/>
-		<coverageLevel value="80" match="localeDisplayNames/languages/language[@type='%language80']"/> 
-		<coverageLevel value="80" match="localeDisplayNames/languages/language[@type='%language80'][@alt='%shortVariant']"/> 
+		<coverageLevel value="80" match="localeDisplayNames/languages/language[@type='%language80']"/>
+		<coverageLevel value="80" match="localeDisplayNames/languages/language[@type='%language80'][@alt='%shortVariant']"/>
 		<coverageLevel value="80" match="localeDisplayNames/scripts/script[@type='%script80']"/>
 		<coverageLevel value="80" match="localeDisplayNames/territories/territory[@type='%territory80']"/>
 		<coverageLevel value="80" match="localeDisplayNames/territories/territory[@type='%territory40'][@alt='%shortVariant']"/>
@@ -409,7 +409,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel value="80" match="dates/calendars/calendar[@type='gregorian']/dateTimeFormats/availableFormats/dateFormatItem[@id='%dateFormatItemsAll']"/>
 		<coverageLevel value="80" match="dates/fields/field[@type='day']/relative[@type='(-3|-2|2|3)']"/>
 		<coverageLevel value="80" match="dates/fields/field[@type='%dayTypes']/relative[@type='(-1|0|1)']"/>
-		<coverageLevel value="80" match="dates/fields/field[@type='%relativeTimeTypes']/relativeTime[@type='%futurePast']/relativeTimePattern[@count='${Target-Plurals}']"/>		
+		<coverageLevel value="80" match="dates/fields/field[@type='%relativeTimeTypes']/relativeTime[@type='%futurePast']/relativeTimePattern[@count='${Target-Plurals}']"/>
 		<coverageLevel value="80" match="dates/timeZoneNames/metazone[@type='%metazone80']/long/generic"/>
 		<coverageLevel value="80" match="dates/timeZoneNames/metazone[@type='%metazone80']/long/standard"/>
 		<coverageLevel value="80" match="dates/timeZoneNames/metazone[@type='%metazone80']/long/daylight"/>
diff --git a/lib/Zend/Locale/Data/languageInfo.xml b/lib/Zend/Locale/Data/languageInfo.xml
index a4d4ce4f792..3ab8f194c09 100644
--- a/lib/Zend/Locale/Data/languageInfo.xml
+++ b/lib/Zend/Locale/Data/languageInfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<!-- Copyright © 1991-2013 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) 
+<!-- Copyright © 1991-2013 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 	For terms of use, see http://www.unicode.org/copyright.html -->
 
 <supplementalData>
@@ -137,11 +137,11 @@
 			<!-- Region Matches -->
 			<languageMatch desired="en_*_US" supported="en_*_*" percent="97" /><!-- Non-US Englishes are closer to each other. Managed by having en-US be further from everything else. -->
 			<languageMatch desired="en_*_*" supported="en_*_*" percent="99" />
-			
+
 			<languageMatch desired="es_*_ES" supported="es_*_*" percent="97" />    <!-- Latin American Spanishes are closer to each other. Managed by having es-ES be further from everything else. -->
 			<languageMatch desired="es_*_419" supported="es_*_*" percent="99" />	<!-- Make 419 a bit closer to each one than they are to one another. -->
 			<languageMatch desired="es_*_*" supported="es_*_*" percent="98" />
-						
+
 			<!-- Fallbacks -->
 			<languageMatch desired="*" supported="*" percent="1" />  <!-- [Default value - must be at end!] Normally there is no comprehension of different languages. -->
 			<languageMatch desired="*_*" supported="*_*" percent="20" /> <!-- [Default value - must be at end!] Normally there is little comprehension of different scripts. -->
diff --git a/lib/Zend/Locale/Data/supplementalData.xml b/lib/Zend/Locale/Data/supplementalData.xml
index b2856533a57..8e801e4098c 100644
--- a/lib/Zend/Locale/Data/supplementalData.xml
+++ b/lib/Zend/Locale/Data/supplementalData.xml
@@ -83,7 +83,7 @@ Note: When reading these dates, you should read them as inclusive date ranges.
 The date ranges are like date ranges that you see on tomb stones,
 but some dates are approximate. Some date ranges overlap due to
 revolts, invasions, new constitutions, and slow planned adoption of new currency.
-The length of time for these change overs vary widely. 
+The length of time for these change overs vary widely.
 Sometimes, hyperinflation will cause more than one currency to be in effect
 in one year. Dates without a "to" attribute mean that the currency is still
 in use.
@@ -104,7 +104,7 @@ application of trade, commerce or banking. ... At its seventeenth session
 codes for International Standard ISO 4217, "Codes for the representation of
 currencies and funds", would be suitable for use in international trade.
 
-Most of this list was derived from the following sources: 
+Most of this list was derived from the following sources:
 http://www.iso.org/iso/en/prods-services/popstds/currencycodeslist.html
 http://www.globalfindata.com/gh/index.html
 http://europa.eu.int/comm/translation/currencies/entable1.htm
@@ -1006,8 +1006,8 @@ CLDR adds data for one or more UN M49 numeric region code such as 150.
             <currency iso4217="XAF" from="1993-01-01"/>
         </region>
         <region iso3166="TF">
-        <!-- Part of the Antarctic claimed by France (whose sovereignty is not recognised 
-        internationally), makes up the French Southern and Antarctic Lands (TAAF) 
+        <!-- Part of the Antarctic claimed by France (whose sovereignty is not recognised
+        internationally), makes up the French Southern and Antarctic Lands (TAAF)
         administered from Saint-Pierre de la Réunion. No indigenous population -->
             <currency iso4217="EUR" from="1999-01-01"/>
             <currency iso4217="FRF" from="1959-01-01" to="2002-02-17"/>
@@ -4302,12 +4302,12 @@ XXX Code for transations where no currency is involved
 			ZA ZW"
           />
           <firstDay day="sun"  territories="GB" alt="variant" references="Shorter Oxford Dictionary (5th edition, 2002)"/>
-        
+
           <weekendStart day="thu"  territories="AF DZ IR OM"/>
           <weekendStart day="fri"  territories="AE BH EG IL IQ JO KW LY MA QA SA SD SY TN YE"/>
           <weekendStart day="sat"  territories="001"/>
           <weekendStart day="sun"  territories="IN"/>
-        
+
           <weekendEnd day="fri"  territories="AF DZ IR OM"/>
           <weekendEnd day="sat"  territories="AE BH EG IL IQ JO KW LY MA QA SA SD SY TN YE"/>
           <weekendEnd day="sun"  territories="001"/>
@@ -4691,7 +4691,7 @@ XXX Code for transations where no currency is involved
 		<parentLocale parent="pt_PT" locales="pt_AO pt_CV pt_GW pt_MO pt_MZ pt_ST pt_TL"/>
 		<parentLocale parent="zh_Hant_HK" locales="zh_Hant_MO"/>
 	</parentLocales>
-	
+
 	<references>
 		<reference type="R1000" uri="https://www.cia.gov/cia/publications/factbook/geos/aa.html">Dutch official</reference>
 		<reference type="R1001" uri="http://www.migrationinformation.org/Feature/display.cfm?ID=72">At most 6% are not fluent in English</reference>
diff --git a/lib/Zend/Locale/Data/supplementalMetadata.xml b/lib/Zend/Locale/Data/supplementalMetadata.xml
index 626282815e6..48655fb69c9 100644
--- a/lib/Zend/Locale/Data/supplementalMetadata.xml
+++ b/lib/Zend/Locale/Data/supplementalMetadata.xml
@@ -38,9 +38,9 @@ ldml alternate approvalRequirement approvalRequirements attributeOrder attribute
             <attributes element="weekendStart" attribute="time" attributeValue="00:00"/>
         </suppress>
         <validity>
-            <!-- BCP 47 contains many more language codes than we are interested in maintaining as a part of the CLDR --> 
-            <!-- This list contains ONLY those languages considered to be "of interest" as part of CLDR, --> 
-            <!-- and is maintained manually by the CLDR TC --> 
+            <!-- BCP 47 contains many more language codes than we are interested in maintaining as a part of the CLDR -->
+            <!-- This list contains ONLY those languages considered to be "of interest" as part of CLDR, -->
+            <!-- and is maintained manually by the CLDR TC -->
             <variable id="$language" type="choice">
                 aa ab ace ach ada ady ae af afh agq ain ak akk ale alt am an ang anp ar
                 arc arn arp arw as asa ast av awa ay az
@@ -711,7 +711,7 @@ ldml alternate approvalRequirement approvalRequirements attributeOrder attribute
             <!-- specialized lists and types -->
             <variable id="$tzidList" type="list">$tzid</variable>
             <variable id="$casing" type="choice">titlecase-words titlecase-firstword lowercase-words mixed</variable>
-    
+
             <!-- allow may expand in future to a space separated list i.e. ((newitem)?( )?)?(verbatim)? -->
             <variable id="$allow" type="regex">(verbatim)</variable>
             <variable id="$alt" type="regex">((stand-alone|variant|list|secondary|email|www|short|narrow|new|accounting)(-proposed.*)?|(proposed.*))</variable>
@@ -727,7 +727,7 @@ ldml alternate approvalRequirement approvalRequirements attributeOrder attribute
             <variable id="$uri" type="notDoneYet"/>
             <variable id="$variableID" type="regex">[$][a-zA-Z0-9]+</variable>
             <variable id="$version" type="regex">\$.*\$</variable>
-            
+
             <attributeValues attributes="alt" type="choice">$alt</attributeValues>
             <attributeValues attributes="validSubLocales" type="list">$locale</attributeValues>
             <attributeValues elements="alias" attributes="path" type="path">notDoneYet</attributeValues>
@@ -1771,8 +1771,8 @@ ldml alternate approvalRequirement approvalRequirements attributeOrder attribute
             <variantAlias type="POLYTONI" replacement="POLYTON" reason="deprecated"/>
             <variantAlias type="HEPLOC" replacement="ALALC97" reason="deprecated"/>
             <variantAlias type="SAAHO" reason="deprecated"/>
-            <zoneAlias type="Africa/Timbuktu" replacement="Africa/Bamako" reason="deprecated"/>          
-            <zoneAlias type="Pacific/Yap" replacement="Pacific/Truk" reason="deprecated"/>          
+            <zoneAlias type="Africa/Timbuktu" replacement="Africa/Bamako" reason="deprecated"/>
+            <zoneAlias type="Pacific/Yap" replacement="Pacific/Truk" reason="deprecated"/>
             <zoneAlias type="Europe/Belfast" replacement="Europe/London" reason="deprecated"/>
             <zoneAlias type="SystemV/AST4ADT" replacement="America/Halifax" reason="deprecated"/>
             <zoneAlias type="SystemV/EST5EDT" replacement="America/New_York" reason="deprecated"/>
@@ -1789,7 +1789,7 @@ ldml alternate approvalRequirement approvalRequirements attributeOrder attribute
             <zoneAlias type="SystemV/PST8" replacement="Pacific/Pitcairn" reason="deprecated"/>
             <zoneAlias type="SystemV/YST9" replacement="Pacific/Gambier" reason="deprecated"/>
             <zoneAlias type="SystemV/HST10" replacement="Pacific/Honolulu" reason="deprecated"/>
-            <zoneAlias type="HST" replacement="Pacific/Honolulu" reason="deprecated"/>       
+            <zoneAlias type="HST" replacement="Pacific/Honolulu" reason="deprecated"/>
             <zoneAlias type="Atlantic/Jan_Mayen" replacement="Europe/Oslo" reason="deprecated"/>
             <zoneAlias type="America/Shiprock" replacement="America/Denver" reason="deprecated"/>
             <zoneAlias type="Antarctica/South_Pole" replacement="Pacific/Auckland" reason="deprecated"/>
diff --git a/lib/Zend/Locale/Data/telephoneCodeData.xml b/lib/Zend/Locale/Data/telephoneCodeData.xml
index 7f6eff935a0..954d0d25884 100644
--- a/lib/Zend/Locale/Data/telephoneCodeData.xml
+++ b/lib/Zend/Locale/Data/telephoneCodeData.xml
@@ -14,11 +14,11 @@ For terms of use, see http://www.unicode.org/copyright.html
 		1.	International Telecommunication Union: List Of ITU Recommendation E.164 Assigned Country Codes (Position on 15 September 2007)
 			available at <http://www.itu.int/opb/publications.aspx?parent=T-SP&view=T-SP2>
 		2.	World Telephone Numbering Guide <http://www.wtng.info/>
-		
+
 		Special cases below: 001, AC, AQ, AS, GU, PS, VA, XK, YT
 		Unknown telephoneCountryCode for territories: BV, HM
 		-->
-	
+
 		<codesByTerritory territory="001">
 			<telephoneCountryCode code="388"/>	<!-- CountryGroup = Code for groups of countries, shared code -->
 				<!-- +388 3	CountryGroup (European Telephony Numbering Space) -->
@@ -75,7 +75,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<telephoneCountryCode code="991"/>	<!-- trial of proposed new International Telecom Public Correspondence service -->
 			<!-- telephoneCountryCode code="999" -->	<!-- Reserved for future global service (proposed Disaster Relief Service, or is that just +888?) -->
 		</codesByTerritory>
-		
+
 		<codesByTerritory territory="AC">	<!-- Ascension Island; in ISO 3166, code AC is "exceptionally reserved" for it but not officially assigned -->
 			<telephoneCountryCode code="247"/>
 			<!-- Ascension is administered by SH Saint Helena, 800 miles away with a different telephoneCountryCode +290 -->
@@ -836,7 +836,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<codesByTerritory territory="ZW">	<!-- Zimbabwe -->
 			<telephoneCountryCode code="263"/>
 		</codesByTerritory>
-		
+
 		<!-- currently spare or otherwise unused telephoneCountryCode codes:
 			+210 (reserved for Morocco?)
 			+211 (reserved for Morocco?)
diff --git a/lib/Zend/Log/Formatter/Xml.php b/lib/Zend/Log/Formatter/Xml.php
index 8d88d630710..039bd4c50c0 100644
--- a/lib/Zend/Log/Formatter/Xml.php
+++ b/lib/Zend/Log/Formatter/Xml.php
@@ -146,8 +146,8 @@ public function format($event)
         $elt = $dom->appendChild(new DOMElement($this->_rootElement));
 
         foreach ($dataToInsert as $key => $value) {
-            if (empty($value) 
-                || is_scalar($value) 
+            if (empty($value)
+                || is_scalar($value)
                 || (is_object($value) && method_exists($value,'__toString'))
             ) {
                 if($key == "message") {
diff --git a/lib/Zend/Mail/Part.php b/lib/Zend/Mail/Part.php
index 26959489575..2396770d2d5 100644
--- a/lib/Zend/Mail/Part.php
+++ b/lib/Zend/Mail/Part.php
@@ -96,10 +96,10 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface
      * @var int
      */
     protected $_messageNum = 0;
-    
+
     /**
      * Class to use when creating message parts
-     * @var string 
+     * @var string
      */
     protected $_partClass;
 
@@ -138,7 +138,7 @@ public function __construct(array $params)
             $this->_mail       = $params['handler'];
             $this->_messageNum = $params['id'];
         }
-        
+
         if (isset($params['partclass'])) {
             $this->setPartClass($params['partclass']);
         }
@@ -162,7 +162,7 @@ public function __construct(array $params)
             }
         }
     }
-    
+
     /**
      * Set name pf class used to encapsulate message parts
      * @param string $class
@@ -184,14 +184,14 @@ public function setPartClass($class)
             #require_once 'Zend/Mail/Exception.php';
             throw new Zend_Mail_Exception("Class '{$class}' must implement Zend_Mail_Part_Interface");
         }
-        
+
         $this->_partClass = $class;
         return $this;
     }
-    
+
     /**
      * Retrieve the class name used to encapsulate message parts
-     * @return string 
+     * @return string
      */
     public function getPartClass()
     {
diff --git a/lib/Zend/Mobile/Push/Abstract.php b/lib/Zend/Mobile/Push/Abstract.php
index 2752acbfdda..2cc57f24199 100644
--- a/lib/Zend/Mobile/Push/Abstract.php
+++ b/lib/Zend/Mobile/Push/Abstract.php
@@ -47,7 +47,7 @@ abstract class Zend_Mobile_Push_Abstract implements Zend_Mobile_Push_Interface
 
     /**
      * Connect to the Push Server
-     * 
+     *
      * @return Zend_Mobile_Push_Abstract
      */
     public function connect()
diff --git a/lib/Zend/Mobile/Push/Apns.php b/lib/Zend/Mobile/Push/Apns.php
index 739bccadef9..8f62fae0cb8 100644
--- a/lib/Zend/Mobile/Push/Apns.php
+++ b/lib/Zend/Mobile/Push/Apns.php
@@ -184,7 +184,7 @@ protected function _connect($uri)
 
     /**
     * Read from the Socket Server
-    * 
+    *
     * @param int $length
     * @return string
     */
@@ -198,7 +198,7 @@ protected function _read($length) {
 
     /**
     * Write to the Socket Server
-    * 
+    *
     * @param string $payload
     * @return int
     */
@@ -313,7 +313,7 @@ public function send(Zend_Mobile_Push_Message_Abstract $message)
         foreach($message->getCustomData() as $k => $v) {
             $payload[$k] = $v;
         }
-        
+
         if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
             $payload = json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
         } else {
diff --git a/lib/Zend/Mobile/Push/Message/Abstract.php b/lib/Zend/Mobile/Push/Message/Abstract.php
index e16a2b58396..8e50b3ac502 100644
--- a/lib/Zend/Mobile/Push/Message/Abstract.php
+++ b/lib/Zend/Mobile/Push/Message/Abstract.php
@@ -80,7 +80,7 @@ public function setToken($token)
 
     /**
      * Get Message ID
-     * 
+     *
      * @return int|string|float|bool Scalar
      */
     public function getId()
diff --git a/lib/Zend/Mobile/Push/Message/Gcm.php b/lib/Zend/Mobile/Push/Message/Gcm.php
index e7736d4ee1a..db61e29c34a 100644
--- a/lib/Zend/Mobile/Push/Message/Gcm.php
+++ b/lib/Zend/Mobile/Push/Message/Gcm.php
@@ -46,7 +46,7 @@ class Zend_Mobile_Push_Message_Gcm extends Zend_Mobile_Push_Message_Abstract
 
     /**
      * Data key value pairs
-     * 
+     *
      * @var array
      */
     protected $_data = array();
@@ -60,7 +60,7 @@ class Zend_Mobile_Push_Message_Gcm extends Zend_Mobile_Push_Message_Abstract
 
     /**
      * Time to live in seconds
-     * 
+     *
      * @var int
      */
     protected $_ttl = 2419200;
diff --git a/lib/Zend/Mobile/Push/Message/Mpns/Tile.php b/lib/Zend/Mobile/Push/Message/Mpns/Tile.php
index 9881a8ce21d..0b357292910 100644
--- a/lib/Zend/Mobile/Push/Message/Mpns/Tile.php
+++ b/lib/Zend/Mobile/Push/Message/Mpns/Tile.php
@@ -233,7 +233,7 @@ public function getBackContent()
 
     /**
      * Set Back Content
-     * 
+     *
      * @param string $content
      * @return Zend_Mobile_Push_Message_Mpns_Tile
      * @throws Zend_Mobile_Push_Message_Exception
diff --git a/lib/Zend/Mobile/Push/Response/Gcm.php b/lib/Zend/Mobile/Push/Response/Gcm.php
index 9ead42c78d7..151733a7344 100644
--- a/lib/Zend/Mobile/Push/Response/Gcm.php
+++ b/lib/Zend/Mobile/Push/Response/Gcm.php
@@ -195,7 +195,7 @@ public function getCanonicalCount()
      *
      * @return array multi dimensional array of:
      *         NOTE: key is registration_id if the message is passed.
-     *         'registration_id' => array( 
+     *         'registration_id' => array(
      *             'message_id' => 'id',
      *             'error' => 'error',
      *             'registration_id' => 'id'
diff --git a/lib/Zend/Mobile/Push/Test/ApnsProxy.php b/lib/Zend/Mobile/Push/Test/ApnsProxy.php
index 113c96238a2..cbef7f15f09 100644
--- a/lib/Zend/Mobile/Push/Test/ApnsProxy.php
+++ b/lib/Zend/Mobile/Push/Test/ApnsProxy.php
@@ -31,7 +31,7 @@
  * @package    Zend_Mobile
  * @subpackage Push
  */
-class Zend_Mobile_Push_Test_ApnsProxy extends Zend_Mobile_Push_Apns 
+class Zend_Mobile_Push_Test_ApnsProxy extends Zend_Mobile_Push_Apns
 {
     /**
      * Read Response
diff --git a/lib/Zend/Navigation/Container.php b/lib/Zend/Navigation/Container.php
index 448d55407d5..5183c287108 100644
--- a/lib/Zend/Navigation/Container.php
+++ b/lib/Zend/Navigation/Container.php
@@ -146,7 +146,7 @@ public function addPage($page)
      * @param  Zend_Navigation_Page[]|Zend_Config|Zend_Navigation_Container  $pages  pages to add
      * @return Zend_Navigation_Container                    fluent interface,
      *                                                      returns self
-     * @throws Zend_Navigation_Exception                    if $pages is not 
+     * @throws Zend_Navigation_Exception                    if $pages is not
      *                                                      array, Zend_Config or
      *                                                      Zend_Navigation_Container
      */
@@ -284,7 +284,7 @@ public function hasPages()
     }
 
     /**
-     * Returns a child page matching $property == $value or 
+     * Returns a child page matching $property == $value or
      * preg_match($value, $property), or null if not found
      *
      * @param  string  $property          name of property to match against
@@ -294,7 +294,7 @@ public function hasPages()
      * @return Zend_Navigation_Page|null  matching page or null
      */
     public function findOneBy($property, $value, $useRegex = false)
-    {        
+    {
         $iterator = new RecursiveIteratorIterator(
             $this,
             RecursiveIteratorIterator::SELF_FIRST
@@ -302,7 +302,7 @@ public function findOneBy($property, $value, $useRegex = false)
 
         foreach ($iterator as $page) {
             $pageProperty = $page->get($property);
-            
+
             // Rel and rev
             if (is_array($pageProperty)) {
                 foreach ($pageProperty as $item) {
@@ -332,10 +332,10 @@ public function findOneBy($property, $value, $useRegex = false)
                         }
                     }
                 }
-                
+
                 continue;
             }
-            
+
             // Use regex?
             if (true === $useRegex) {
                 if (preg_match($value, $pageProperty)) {
@@ -347,7 +347,7 @@ public function findOneBy($property, $value, $useRegex = false)
                 }
             }
         }
-        
+
         return null;
     }
 
@@ -363,17 +363,17 @@ public function findOneBy($property, $value, $useRegex = false)
      *                           instances
      */
     public function findAllBy($property, $value, $useRegex = false)
-    {        
+    {
         $found = array();
 
         $iterator = new RecursiveIteratorIterator(
             $this,
             RecursiveIteratorIterator::SELF_FIRST
         );
-        
+
         foreach ($iterator as $page) {
             $pageProperty = $page->get($property);
-            
+
             // Rel and rev
             if (is_array($pageProperty)) {
                 foreach ($pageProperty as $item) {
@@ -403,10 +403,10 @@ public function findAllBy($property, $value, $useRegex = false)
                         }
                     }
                 }
-                
+
                 continue;
             }
-            
+
             // Use regex?
             if (true === $useRegex) {
                 if (0 !== preg_match($value, $pageProperty)) {
diff --git a/lib/Zend/Navigation/Page.php b/lib/Zend/Navigation/Page.php
index d4ea05c18da..6a5daf111ec 100644
--- a/lib/Zend/Navigation/Page.php
+++ b/lib/Zend/Navigation/Page.php
@@ -43,14 +43,14 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
 
     /**
      * Fragment identifier (anchor identifier)
-     * 
-     * The fragment identifier (anchor identifier) pointing to an anchor within 
+     *
+     * The fragment identifier (anchor identifier) pointing to an anchor within
      * a resource that is subordinate to another, primary resource.
      * The fragment identifier introduced by a hash mark "#".
      * Example: http://www.example.org/foo.html#bar ("bar" is the fragment identifier)
-     * 
+     *
      * @link http://www.w3.org/TR/html401/intro/intro.html#fragment-uri
-     * 
+     *
      * @var string|null
      */
     protected $_fragment;
@@ -266,12 +266,12 @@ public static function factory($options)
             return new Zend_Navigation_Page_Uri($options);
         } else {
             #require_once 'Zend/Navigation/Exception.php';
-            
+
             $message = 'Invalid argument: Unable to determine class to instantiate';
             if (isset($options['label'])) {
                 $message .= ' (Page label: ' . $options['label'] . ')';
         }
-            
+
             throw new Zend_Navigation_Exception($message);
     }
     }
@@ -382,11 +382,11 @@ public function setFragment($fragment)
             throw new Zend_Navigation_Exception(
                     'Invalid argument: $fragment must be a string or null');
         }
- 
+
         $this->_fragment = $fragment;
         return $this;
     }
-    
+
      /**
      * Returns fragment identifier
      *
@@ -537,7 +537,7 @@ public function setAccesskey($character = null)
                 'Invalid argument: $character must be a single character or null'
             );
         }
- 
+
         $this->_accesskey = $character;
         return $this;
     }
diff --git a/lib/Zend/Navigation/Page/Uri.php b/lib/Zend/Navigation/Page/Uri.php
index e190c374a78..c5d2ea1ad31 100644
--- a/lib/Zend/Navigation/Page/Uri.php
+++ b/lib/Zend/Navigation/Page/Uri.php
@@ -80,16 +80,16 @@ public function getUri()
     public function getHref()
     {
         $uri = $this->getUri();
-        
-        $fragment = $this->getFragment();       
+
+        $fragment = $this->getFragment();
         if (null !== $fragment) {
             if ('#' == substr($uri, -1)) {
                 return $uri . $fragment;
-            } else {                
+            } else {
                 return $uri . '#' . $fragment;
             }
         }
-        
+
         return $uri;
     }
 
diff --git a/lib/Zend/Oauth/Client.php b/lib/Zend/Oauth/Client.php
index 22e6d3d4a82..249fa8b47bd 100644
--- a/lib/Zend/Oauth/Client.php
+++ b/lib/Zend/Oauth/Client.php
@@ -263,7 +263,7 @@ public function prepareOauth()
             $this->setRawData($raw, 'application/x-www-form-urlencoded');
             $this->paramsPost = array();
         } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_QUERYSTRING) {
-            $params = $this->paramsGet;            
+            $params = $this->paramsGet;
             $query = $this->getUri()->getQuery();
             if ($query) {
                 $queryParts = explode('&', $this->getUri()->getQuery());
diff --git a/lib/Zend/Oauth/Config.php b/lib/Zend/Oauth/Config.php
index 0ee8ecc48ee..0cd9ba56e78 100644
--- a/lib/Zend/Oauth/Config.php
+++ b/lib/Zend/Oauth/Config.php
@@ -146,10 +146,10 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface
      * @var Zend_Oauth_Token
      */
     protected $_token = null;
-    
+
     /**
      * Define the OAuth realm
-     * 
+     *
      * @var string
      */
     protected $_realm = null;
diff --git a/lib/Zend/OpenId.php b/lib/Zend/OpenId.php
index 418fa8264ed..b9776142436 100644
--- a/lib/Zend/OpenId.php
+++ b/lib/Zend/OpenId.php
@@ -124,11 +124,11 @@ static public function selfUrl()
         }
 
         $url .= $port;
-        if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { 
+        if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
             // IIS with Microsoft Rewrite Module
             $url .= $_SERVER['HTTP_X_ORIGINAL_URL'];
         } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
-            // IIS with ISAPI_Rewrite 
+            // IIS with ISAPI_Rewrite
             $url .= $_SERVER['HTTP_X_REWRITE_URL'];
         } elseif (isset($_SERVER['REQUEST_URI'])) {
             $query = strpos($_SERVER['REQUEST_URI'], '?');
diff --git a/lib/Zend/OpenId/Consumer.php b/lib/Zend/OpenId/Consumer.php
index 6e831d4c01c..128bf34fdab 100644
--- a/lib/Zend/OpenId/Consumer.php
+++ b/lib/Zend/OpenId/Consumer.php
@@ -300,7 +300,7 @@ public function verify($params, &$identity = "", $extensions = null)
             if (isset($params['openid_op_endpoint']) && $url !== $params['openid_op_endpoint']) {
                 $this->_setError("The op_endpoint URI is not the same of URI associated with the assoc_handle");
                 return false;
-            }       
+            }
             $signed = explode(',', $params['openid_signed']);
             // Check the parameters for the signature
             // @see https://openid.net/specs/openid-authentication-2_0.html#positive_assertions
@@ -314,7 +314,7 @@ public function verify($params, &$identity = "", $extensions = null)
                     return false;
                 }
             }
-            
+
             $data = '';
             foreach ($signed as $key) {
                 $data .= $key . ':' . $params['openid_' . strtr($key,'.','_')] . "\n";
@@ -763,13 +763,13 @@ protected function _discovery(&$id, &$server, &$version)
                 $r)) {
             $XRDS = $r[3];
             $version = 2.0;
-            $response = $this->_httpRequest($XRDS); 
+            $response = $this->_httpRequest($XRDS);
             if (preg_match(
                     '/<URI>([^\t]*)<\/URI>/i',
                     $response,
                     $x)) {
                 $server = $x[1];
-                // $realId 
+                // $realId
                 $realId = 'http://specs.openid.net/auth/2.0/identifier_select';
             }
             else {
diff --git a/lib/Zend/Paginator.php b/lib/Zend/Paginator.php
index 0013ea31aa7..e9af2432a06 100644
--- a/lib/Zend/Paginator.php
+++ b/lib/Zend/Paginator.php
@@ -533,7 +533,7 @@ public function getTotalItemCount()
         if (!$this->_cacheEnabled()) {
             return count($this->getAdapter());
         } else {
-            $cacheId   = md5($this->_getCacheInternalId(). '_itemCount');            
+            $cacheId   = md5($this->_getCacheInternalId(). '_itemCount');
             $itemCount = self::$_cache->load($cacheId);
 
             if ($itemCount === false) {
@@ -541,7 +541,7 @@ public function getTotalItemCount()
 
                 self::$_cache->save($itemCount, $cacheId, array($this->_getCacheInternalId()));
             }
-            
+
             return $itemCount;
         }
     }
@@ -1058,7 +1058,7 @@ protected function _getCacheId($page = null)
     protected function _getCacheInternalId()
     {
         $adapter = $this->getAdapter();
-        
+
         if (method_exists($adapter, 'getCacheIdentifier')) {
             return md5(serialize(array(
                 $adapter->getCacheIdentifier(), $this->getItemCountPerPage()
diff --git a/lib/Zend/Paginator/Adapter/DbSelect.php b/lib/Zend/Paginator/Adapter/DbSelect.php
index 4ccadd774db..1584bcbca8a 100644
--- a/lib/Zend/Paginator/Adapter/DbSelect.php
+++ b/lib/Zend/Paginator/Adapter/DbSelect.php
@@ -91,14 +91,14 @@ public function __construct(Zend_Db_Select $select)
 
     /**
      * Returns the cache identifier.
-     * 
+     *
      * @return string
      */
     public function getCacheIdentifier()
     {
         return $this->_cacheIdentifier;
     }
-    
+
     /**
      * Sets the total row count, either directly or through a supplied
      * query.  Without setting this, {@link getPages()} selects the count
@@ -237,7 +237,7 @@ public function getCountSelect()
              * than one group, or if the query has a HAVING clause, then take
              * the original query and use it as a subquery os the COUNT query.
              */
-            if (($isDistinct && ((count($columnParts) == 1 && $columnParts[0][1] == Zend_Db_Select::SQL_WILDCARD) 
+            if (($isDistinct && ((count($columnParts) == 1 && $columnParts[0][1] == Zend_Db_Select::SQL_WILDCARD)
                  || count($columnParts) > 1)) || count($groupParts) > 1 || !empty($havingParts)) {
                 $rowCount->reset(Zend_Db_Select::ORDER);
                 $rowCount = $db
diff --git a/lib/Zend/Pdf.php b/lib/Zend/Pdf.php
index 0f673035be5..d4a262c7a4f 100644
--- a/lib/Zend/Pdf.php
+++ b/lib/Zend/Pdf.php
@@ -612,7 +612,7 @@ protected function _loadJavaScript(Zend_Pdf_Element_Reference $root)
             }
         }
     }
-  
+
     /**
      * Load form fields
      *
diff --git a/lib/Zend/Reflection/Method.php b/lib/Zend/Reflection/Method.php
index 169e894c7c8..b9ae1d91366 100644
--- a/lib/Zend/Reflection/Method.php
+++ b/lib/Zend/Reflection/Method.php
@@ -156,7 +156,7 @@ public function getBody()
             $firstLine = array_shift($lines);
         } while (strpos($firstLine, ')') === false);
 
-        // If the opening brace isn't on the same line as method 
+        // If the opening brace isn't on the same line as method
         // signature, then we should pop off more lines until we find it
         if (strpos($firstLine,'{') === false) {
             do {
diff --git a/lib/Zend/Rest/Client.php b/lib/Zend/Rest/Client.php
index a439306f5ef..db49442728c 100644
--- a/lib/Zend/Rest/Client.php
+++ b/lib/Zend/Rest/Client.php
@@ -50,7 +50,7 @@ class Zend_Rest_Client extends Zend_Service_Abstract
      * @var Zend_Uri_Http
      */
     protected $_uri = null;
-    
+
     /**
      * Flag indicating the Zend_Http_Client is fresh and needs no reset.
      * Must be set explicitly if you want to keep preset parameters.
@@ -126,18 +126,18 @@ private function _prepareRest($path)
          * because the Zend_Http_Client instance is shared among all Zend_Service_Abstract subclasses.
          */
         if ($this->_noReset) {
-            // if $_noReset we do not want to reset on this request, 
+            // if $_noReset we do not want to reset on this request,
             // but we do on any subsequent request
             $this->_noReset = false;
         } else {
             self::getHttpClient()->resetParameters();
         }
-        
+
         self::getHttpClient()->setUri($this->_uri);
     }
-    
+
     /**
-     * Tells Zend_Rest_Client not to reset all parameters on it's 
+     * Tells Zend_Rest_Client not to reset all parameters on it's
      * Zend_Http_Client. If you want no reset, this must be called explicitly
      * before every request for which you do not want to reset the parameters.
      * Parameters will accumulate between requests, but as soon as you do not
diff --git a/lib/Zend/Rest/Client/Result.php b/lib/Zend/Rest/Client/Result.php
index 8724654c004..a9286994730 100644
--- a/lib/Zend/Rest/Client/Result.php
+++ b/lib/Zend/Rest/Client/Result.php
@@ -50,7 +50,7 @@ class Zend_Rest_Client_Result implements IteratorAggregate {
     public function __construct($data)
     {
         set_error_handler(array($this, 'handleXmlErrors'));
-        $this->_sxml = Zend_Xml_Security::scan($data); 
+        $this->_sxml = Zend_Xml_Security::scan($data);
         restore_error_handler();
         if($this->_sxml === false) {
             if ($this->_errstr === null) {
@@ -183,7 +183,7 @@ public function getStatus()
     {
         $status = $this->_sxml->xpath('//status/text()');
         if ( !isset($status[0]) ) return false;
-        
+
         $status = strtolower($status[0]);
 
         if (ctype_alpha($status) && $status == 'success') {
diff --git a/lib/Zend/Search/Lucene/Analysis/Token.php b/lib/Zend/Search/Lucene/Analysis/Token.php
index dc900d16c62..6e099314505 100644
--- a/lib/Zend/Search/Lucene/Analysis/Token.php
+++ b/lib/Zend/Search/Lucene/Analysis/Token.php
@@ -123,10 +123,10 @@ public function getTermText()
     {
         return $this->_termText;
     }
-    
+
     /**
      * Sets the Token's term text.
-     * 
+     *
      * @param string $text
      * @return this
      */
diff --git a/lib/Zend/Search/Lucene/MultiSearcher.php b/lib/Zend/Search/Lucene/MultiSearcher.php
index 9229908e6a5..b91dc66a5cc 100644
--- a/lib/Zend/Search/Lucene/MultiSearcher.php
+++ b/lib/Zend/Search/Lucene/MultiSearcher.php
@@ -25,7 +25,7 @@
 
 /**
  * Import Zend_Search_Lucene_Interface_MultiSearcher for BC (see ZF-12067)
- * @see Zend_Search_Lucene_Interface_MultiSearcher 
+ * @see Zend_Search_Lucene_Interface_MultiSearcher
  */
 #require_once 'Zend/Search/Lucene/Interface/MultiSearcher.php';
 
diff --git a/lib/Zend/Service/Amazon/Ec2/Abstract.php b/lib/Zend/Service/Amazon/Ec2/Abstract.php
index 4c424c7aa6c..b5433b80ff8 100644
--- a/lib/Zend/Service/Amazon/Ec2/Abstract.php
+++ b/lib/Zend/Service/Amazon/Ec2/Abstract.php
@@ -166,7 +166,7 @@ protected function sendRequest(array $params = array())
             $request->setParameterPost($params);
 
             $httpResponse = $request->request();
-            
+
 
         } catch (Zend_Http_Client_Exception $zhce) {
             $message = 'Error in request to AWS service: ' . $zhce->getMessage();
diff --git a/lib/Zend/Service/Amazon/Ec2/Response.php b/lib/Zend/Service/Amazon/Ec2/Response.php
index 46df93abb82..50e94beed53 100644
--- a/lib/Zend/Service/Amazon/Ec2/Response.php
+++ b/lib/Zend/Service/Amazon/Ec2/Response.php
@@ -121,7 +121,7 @@ public function getDocument()
         } catch (Zend_Http_Exception $e) {
             $body = false;
         }
-        
+
         if ($this->_document === null) {
             if ($body !== false) {
                 // turn off libxml error handling
diff --git a/lib/Zend/Service/Amazon/S3.php b/lib/Zend/Service/Amazon/S3.php
index 7a495fcf715..04fb0f4aa1a 100644
--- a/lib/Zend/Service/Amazon/S3.php
+++ b/lib/Zend/Service/Amazon/S3.php
@@ -283,7 +283,7 @@ public function cleanBucket($bucket)
             );
             $objects = $this->getObjectsByBucket($bucket,$params);
         }
-        
+
         return true;
     }
 
@@ -647,7 +647,7 @@ public function _makeRequest($method, $path='', $params=null, $headers=array(),
             $pathparts = explode('?',$parts[1]);
             $endpath = $pathparts[0];
             $endpoint->setPath('/'.$endpath);
-            
+
         }
         else {
             $endpoint->setPath('/');
@@ -686,7 +686,7 @@ public function _makeRequest($method, $path='', $params=null, $headers=array(),
                  $headers['Content-type'] = self::getMimeType($path);
              }
              $client->setRawData($data, $headers['Content-type']);
-         } 
+         }
          do {
             $retry = false;
 
diff --git a/lib/Zend/Service/Amazon/Sqs.php b/lib/Zend/Service/Amazon/Sqs.php
index 56155db189a..f2bf4f1a0db 100644
--- a/lib/Zend/Service/Amazon/Sqs.php
+++ b/lib/Zend/Service/Amazon/Sqs.php
@@ -85,7 +85,7 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
     public function __construct($accessKey = null, $secretKey = null, $region = null)
     {
         parent::__construct($accessKey, $secretKey, $region);
-        
+
         if (null !== $region) {
             $this->_setEndpoint($region);
         }
@@ -108,7 +108,7 @@ protected function _setEndpoint($region)
             throw new Zend_Service_Amazon_Sqs_Exception('Invalid SQS region specified.');
         }
     }
-    
+
     /**
      * Set SQS endpoint
      *
@@ -133,8 +133,8 @@ public function setEndpoint($region)
 
     /**
      * Get the SQS endpoint
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getEndpoint()
     {
@@ -155,7 +155,7 @@ public function getEndpoints()
     {
         return $this->_sqsEndpoints;
     }
-    
+
     /**
      * Create a new queue
      *
diff --git a/lib/Zend/Service/Delicious.php b/lib/Zend/Service/Delicious.php
index 62d0be9cd47..04071a0e16d 100644
--- a/lib/Zend/Service/Delicious.php
+++ b/lib/Zend/Service/Delicious.php
@@ -508,7 +508,7 @@ public function makeRequest($path, array $parms = array(), $type = 'xml')
         switch ($type) {
             case 'xml':
                 $dom = new DOMDocument() ;
-    
+
                 if (!$dom = @Zend_Xml_Security::scan($responseBody, $dom)) {
                     /**
                      * @see Zend_Service_Delicious_Exception
diff --git a/lib/Zend/Service/Rackspace/Abstract.php b/lib/Zend/Service/Rackspace/Abstract.php
index 392ecf9b3f4..18a159b2edc 100644
--- a/lib/Zend/Service/Rackspace/Abstract.php
+++ b/lib/Zend/Service/Rackspace/Abstract.php
@@ -91,13 +91,13 @@ abstract class Zend_Service_Rackspace_Abstract
     protected $cdnUrl;
     /**
      * Server management URL
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $managementUrl;
     /**
      * Do we use ServiceNet?
-     * 
+     *
      * @var boolean
      */
     protected $useServiceNet = false;
@@ -161,7 +161,7 @@ public function getAuthUrl()
      *
      * @return string|boolean
      */
-    public function getStorageUrl() 
+    public function getStorageUrl()
     {
         if (empty($this->storageUrl)) {
             if (!$this->authenticate()) {
@@ -175,7 +175,7 @@ public function getStorageUrl()
      *
      * @return string|boolean
      */
-    public function getCdnUrl() 
+    public function getCdnUrl()
     {
         if (empty($this->cdnUrl)) {
             if (!$this->authenticate()) {
@@ -186,9 +186,9 @@ public function getCdnUrl()
     }
     /**
      * Get the management server URL
-     * 
+     *
      * @return string|boolean
-     */     
+     */
     public function getManagementUrl()
     {
         if (empty($this->managementUrl)) {
@@ -237,13 +237,13 @@ public function setAuthUrl($url)
             throw new Zend_Service_Rackspace_Exception("The authentication URL is not valid");
         }
     }
-    
+
     /**
      * Sets whether to use ServiceNet
-     * 
+     *
      * ServiceNet is Rackspace's internal network. Bandwidth on ServiceNet is
      * not charged.
-     * 
+     *
      * @param boolean $useServiceNet
      */
     public function setServiceNet($useServiceNet = true)
@@ -254,7 +254,7 @@ public function setServiceNet($useServiceNet = true)
 
     /**
      * Get whether we're using ServiceNet
-     * 
+     *
      * @return boolean
      */
     public function getServiceNet()
@@ -281,16 +281,16 @@ public function getToken()
      *
      * @return string
      */
-    public function getErrorMsg() 
+    public function getErrorMsg()
     {
         return $this->errorMsg;
     }
     /**
      * Get the error code of the last HTTP call
-     * 
-     * @return strig 
+     *
+     * @return strig
      */
-    public function getErrorCode() 
+    public function getErrorCode()
     {
         return $this->errorCode;
     }
@@ -308,8 +308,8 @@ public function getHttpClient()
     }
     /**
      * Return true is the last call was successful
-     * 
-     * @return boolean 
+     *
+     * @return boolean
      */
     public function isSuccessful()
     {
@@ -330,18 +330,18 @@ protected function httpCall($url,$method,$headers=array(),$data=array(),$body=nu
         $client = $this->getHttpClient();
         $client->resetParameters(true);
         if ($method == 'PUT' && empty($body)) {
-            // if left at NULL a PUT request will always have 
+            // if left at NULL a PUT request will always have
             // Content-Type: x-url-form-encoded, which breaks copyObject()
-            $client->setEncType(''); 
+            $client->setEncType('');
         }
         if (empty($headers[self::AUTHUSER_HEADER])) {
             $headers[self::AUTHTOKEN]= $this->getToken();
-        } 
+        }
         $client->setMethod($method);
         if (empty($data['format'])) {
             $data['format']= self::API_FORMAT;
         }
-        $client->setParameterGet($data);    
+        $client->setParameterGet($data);
         if (!empty($body)) {
             $client->setRawData($body);
             if (!isset($headers['Content-Type'])) {
@@ -388,5 +388,5 @@ public function authenticate()
         $this->errorMsg = $result->getBody();
         $this->errorCode = $result->getStatus();
         return false;
-    } 
+    }
 }
diff --git a/lib/Zend/Service/Rackspace/Files.php b/lib/Zend/Service/Rackspace/Files.php
index a9289c70975..67c37c08b72 100644
--- a/lib/Zend/Service/Rackspace/Files.php
+++ b/lib/Zend/Service/Rackspace/Files.php
@@ -140,7 +140,7 @@ public function getCdnContainers($options=array())
      * - total count containers
      * - size in bytes of all the containers
      * - total objects in all the containers
-     * 
+     *
      * @return array|bool
      */
     public function getInfoAccount()
@@ -271,7 +271,7 @@ public function getMetadataContainer($container)
                 $headers= $result->getHeaders();
                 $count= strlen(self::METADATA_CONTAINER_HEADER);
                 // Zend_Http_Response alters header name in array key, so match our header to what will be in the headers array
-                $headerName = ucwords(strtolower(self::METADATA_CONTAINER_HEADER)); 
+                $headerName = ucwords(strtolower(self::METADATA_CONTAINER_HEADER));
                 $metadata= array();
                 foreach ($headers as $type => $value) {
                     if (strpos($type,$headerName)!==false) {
@@ -297,7 +297,7 @@ public function getMetadataContainer($container)
     }
     /**
      * Get a container
-     * 
+     *
      * @param  string $container
      * @return Zend_Service_Rackspace_Files_Container|bool
      */
@@ -517,7 +517,7 @@ public function getMetadataObject($container,$object) {
                 $headers= $result->getHeaders();
                 $count= strlen(self::METADATA_OBJECT_HEADER);
                 // Zend_Http_Response alters header name in array key, so match our header to what will be in the headers array
-                $headerName = ucwords(strtolower(self::METADATA_OBJECT_HEADER)); 
+                $headerName = ucwords(strtolower(self::METADATA_OBJECT_HEADER));
                 $metadata= array();
                 foreach ($headers as $type => $value) {
                     if (strpos($type,$headerName)!==false) {
diff --git a/lib/Zend/Service/Rackspace/Files/Object.php b/lib/Zend/Service/Rackspace/Files/Object.php
index 7074de265e3..7b540f9320f 100644
--- a/lib/Zend/Service/Rackspace/Files/Object.php
+++ b/lib/Zend/Service/Rackspace/Files/Object.php
@@ -164,7 +164,7 @@ public function __construct($service, $data)
      *
      * @return string
      */
-    public function getName() 
+    public function getName()
     {
         return $this->name;
     }
@@ -174,7 +174,7 @@ public function getName()
      *
      * @return string
      */
-    public function getContainer() 
+    public function getContainer()
     {
         return $this->container;
     }
@@ -184,7 +184,7 @@ public function getContainer()
      *
      * @return string|boolean
      */
-    public function getHash() 
+    public function getHash()
     {
         return $this->hash;
     }
@@ -194,7 +194,7 @@ public function getHash()
      *
      * @return integer|boolean
      */
-    public function getSize() 
+    public function getSize()
     {
         return $this->size;
     }
@@ -204,7 +204,7 @@ public function getSize()
      *
      * @return string
      */
-    public function getContentType() 
+    public function getContentType()
     {
         return $this->contentType;
     }
@@ -214,7 +214,7 @@ public function getContentType()
      *
      * @return string
      */
-    public function getLastModified() 
+    public function getLastModified()
     {
         return $this->lastModified;
     }
@@ -224,7 +224,7 @@ public function getLastModified()
      *
      * @return string
      */
-    public function getContent() 
+    public function getContent()
     {
         return $this->content;
     }
@@ -236,7 +236,7 @@ public function getContent()
      * @param  string $key
      * @return string|array|boolean
      */
-    public function getMetadata($key=null) 
+    public function getMetadata($key=null)
     {
         $result= $this->service->getMetadataObject($this->container,$this->name);
         if (!empty($result)) {
@@ -253,11 +253,11 @@ public function getMetadata($key=null)
     /**
      * Set the metadata value
      * The old metadata values are replaced with the new one
-     * 
+     *
      * @param array $metadata
      * @return boolean
      */
-    public function setMetadata($metadata) 
+    public function setMetadata($metadata)
     {
         return $this->service->setMetadataObject($this->container,$this->name,$metadata);
     }
@@ -273,7 +273,7 @@ public function setMetadata($metadata)
      * @param  string $content_type
      * @return boolean
      */
-    public function copyTo($container_dest,$name_dest,$metadata=array(),$content_type=null) 
+    public function copyTo($container_dest,$name_dest,$metadata=array(),$content_type=null)
     {
         return $this->service->copyObject($this->container,$this->name,$container_dest,$name_dest,$metadata,$content_type);
     }
@@ -283,7 +283,7 @@ public function copyTo($container_dest,$name_dest,$metadata=array(),$content_typ
      *
      * @return string
      */
-    public function getCdnUrl() 
+    public function getCdnUrl()
     {
         $result= $this->service->getInfoCdnContainer($this->container);
         if ($result!==false) {
@@ -299,7 +299,7 @@ public function getCdnUrl()
      *
      * @return string
      */
-    public function getCdnUrlSsl() 
+    public function getCdnUrlSsl()
     {
         $result= $this->service->getInfoCdnContainer($this->container);
         if ($result!==false) {
diff --git a/lib/Zend/Service/Rackspace/Files/ObjectList.php b/lib/Zend/Service/Rackspace/Files/ObjectList.php
index 2db2ce56d0a..0b86b4bcc11 100644
--- a/lib/Zend/Service/Rackspace/Files/ObjectList.php
+++ b/lib/Zend/Service/Rackspace/Files/ObjectList.php
@@ -52,7 +52,7 @@ class Zend_Service_Rackspace_Files_ObjectList implements Countable, Iterator, Ar
     protected $service;
     /**
      * The container name of the object list
-     * 
+     *
      * @var string
      */
     protected $container;
diff --git a/lib/Zend/Service/Rackspace/Servers.php b/lib/Zend/Service/Rackspace/Servers.php
index 7e7b870e752..830047ba5f6 100644
--- a/lib/Zend/Service/Rackspace/Servers.php
+++ b/lib/Zend/Service/Rackspace/Servers.php
@@ -52,7 +52,7 @@ class Zend_Service_Rackspace_Servers extends Zend_Service_Rackspace_Abstract
     /**
      * Get the list of the servers
      * If $details is true returns detail info
-     * 
+     *
      * @param  boolean $details
      * @return Zend_Service_Rackspace_Servers_ServerList|boolean
      */
@@ -61,12 +61,12 @@ public function listServers($details=false)
         $url= '/servers';
         if ($details) {
             $url.= '/detail';
-        } 
+        }
         $result= $this->httpCall($this->getManagementUrl().$url,'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $servers= json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_ServerList($this,$servers['servers']);
             case '503' :
@@ -87,11 +87,11 @@ public function listServers($details=false)
     }
     /**
      * Get the specified server
-     * 
-     * @param  string $id 
+     *
+     * @param  string $id
      * @return Zend_Service_Rackspace_Servers_Server
      */
-    public function getServer($id) 
+    public function getServer($id)
     {
         if (empty($id)) {
             #require_once 'Zend/Service/Rackspace/Exception.php';
@@ -100,8 +100,8 @@ public function getServer($id)
         $result= $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $server = json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_Server($this,$server['server']);
             case '503' :
@@ -125,11 +125,11 @@ public function getServer($id)
     }
     /**
      * Create a new server
-     * 
+     *
      * The required parameters are specified in $data (name, imageId, falvorId)
      * The $files is an associative array with 'serverPath' => 'localPath'
-     * 
-     * @param  array $data 
+     *
+     * @param  array $data
      * @param  array $metadata
      * @param  array $files
      * @return Zend_Service_Rackspace_Servers_Server|boolean
@@ -186,7 +186,7 @@ public function createServer(array $data, $metadata=array(),$files=array())
         $status = $result->getStatus();
         switch ($status) {
             case '200' :
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 $server = json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_Server($this,$server['server']);
             case '503' :
@@ -210,11 +210,11 @@ public function createServer(array $data, $metadata=array(),$files=array())
     }
     /**
      * Change the name or the admin password for a server
-     * 
+     *
      * @param  string $id
      * @param  string $name
      * @param  string $password
-     * @return boolean 
+     * @return boolean
      */
     protected function updateServer($id,$name=null,$password=null)
     {
@@ -237,7 +237,7 @@ protected function updateServer($id,$name=null,$password=null)
                 null,null,json_encode(array('server' => $data)));
         $status = $result->getStatus();
         switch ($status) {
-            case '204' : // break intentionally omitted   
+            case '204' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -263,10 +263,10 @@ protected function updateServer($id,$name=null,$password=null)
     }
     /**
      * Change the server's name
-     * 
+     *
      * @param  string $id
      * @param  string $name
-     * @return boolean 
+     * @return boolean
      */
     public function changeServerName($id,$name)
     {
@@ -282,10 +282,10 @@ public function changeServerName($id,$name)
     }
     /**
      * Change the admin password of the server
-     * 
+     *
      * @param  string $id
      * @param  string $password
-     * @return boolean 
+     * @return boolean
      */
     public function changeServerPassword($id,$password)
     {
@@ -301,9 +301,9 @@ public function changeServerPassword($id,$password)
     }
     /**
      * Delete a server
-     * 
+     *
      * @param  string $id
-     * @return boolean 
+     * @return boolean
      */
     public function deleteServer($id)
     {
@@ -314,7 +314,7 @@ public function deleteServer($id)
         $result = $this->httpCall($this->getManagementUrl().'/servers/'.rawurlencode($id),'DELETE');
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -340,9 +340,9 @@ public function deleteServer($id)
     }
     /**
      * Get the server's IPs (public and private)
-     * 
+     *
      * @param  string $id
-     * @return array|boolean 
+     * @return array|boolean
      */
     public function getServerIp($id)
     {
@@ -355,7 +355,7 @@ public function getServerIp($id)
     }
     /**
      * Get the Public IPs of a server
-     * 
+     *
      * @param  string $id
      * @return array|boolean
      */
@@ -369,7 +369,7 @@ public function getServerPublicIp($id)
     }
     /**
      * Get the Private IPs of a server
-     * 
+     *
      * @param  string $id
      * @return array|boolean
      */
@@ -383,9 +383,9 @@ public function getServerPrivateIp($id)
     }
     /**
      * Share an ip address for a server (id)
-     * 
+     *
      * @param  string $id server
-     * @param  string $ip 
+     * @param  string $ip
      * @param  string $groupId
      * @return boolean
      */
@@ -416,7 +416,7 @@ public function shareIpAddress($id,$ip,$groupId,$configure=true)
                 null,null,json_encode(array('shareIp' => $data)));
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -439,10 +439,10 @@ public function shareIpAddress($id,$ip,$groupId,$configure=true)
     }
     /**
      * Unshare IP address for a server ($id)
-     * 
+     *
      * @param  string $id
      * @param  string $ip
-     * @return boolean 
+     * @return boolean
      */
     public function unshareIpAddress($id,$ip)
     {
@@ -463,7 +463,7 @@ public function unshareIpAddress($id,$ip)
                 'DELETE');
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -486,12 +486,12 @@ public function unshareIpAddress($id,$ip)
     }
     /**
      * Reboot a server
-     * 
+     *
      * $hard true is the equivalent of power cycling the server
      * $hard false is a graceful shutdown
-     * 
+     *
      * @param  string $id
-     * @param  boolean $hard 
+     * @param  boolean $hard
      * @return boolean
      */
     public function rebootServer($id,$hard=false)
@@ -515,7 +515,7 @@ public function rebootServer($id,$hard=false)
         $status = $result->getStatus();
         switch ($status) {
             case '200' :
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -541,10 +541,10 @@ public function rebootServer($id,$hard=false)
     }
     /**
      * Rebuild a server
-     * 
+     *
      * The rebuild function removes all data on the server and replaces it with the specified image,
      * serverId and IP addresses will remain the same.
-     * 
+     *
      * @param  string $id
      * @param  string $imageId
      * @return boolean
@@ -568,7 +568,7 @@ public function rebuildServer($id,$imageId)
                                   'POST', null, null, json_encode($data));
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -594,13 +594,13 @@ public function rebuildServer($id,$imageId)
     }
     /**
      * Resize a server
-     * 
+     *
      * The resize function converts an existing server to a different flavor, in essence, scaling the
      * server up or down. The original server is saved for a period of time to allow rollback if there
      * is a problem. All resizes should be tested and explicitly confirmed, at which time the original
      * server is removed. All resizes are automatically confirmed after 24 hours if they are not
      * explicitly confirmed or reverted.
-     * 
+     *
      * @param  string $id
      * @param  string $flavorId
      * @return boolean
@@ -624,7 +624,7 @@ public function resizeServer($id,$flavorId)
                                   'POST', null, null, json_encode($data));
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -653,7 +653,7 @@ public function resizeServer($id,$flavorId)
     }
     /**
      * Confirm resize of a server
-     * 
+     *
      * During a resize operation, the original server is saved for a period of time to allow roll
      * back if there is a problem. Once the newly resized server is tested and has been confirmed
      * to be functioning properly, use this operation to confirm the resize. After confirmation,
@@ -661,7 +661,7 @@ public function resizeServer($id,$flavorId)
      * confirmed after 24 hours if they are not explicitly confirmed or reverted.
      *
      * @param  string $id
-     * @return boolean 
+     * @return boolean
      */
     public function confirmResizeServer($id)
     {
@@ -676,7 +676,7 @@ public function confirmResizeServer($id)
                                   'POST', null, null, json_encode($data));
         $status = $result->getStatus();
         switch ($status) {
-            case '204' : // break intentionally omitted   
+            case '204' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -705,7 +705,7 @@ public function confirmResizeServer($id)
     }
     /**
      * Revert resize of a server
-     * 
+     *
      * During a resize operation, the original server is saved for a period of time to allow for roll
      * back if there is a problem. If you determine there is a problem with a newly resized server,
      * use this operation to revert the resize and roll back to the original server. All resizes are
@@ -713,7 +713,7 @@ public function confirmResizeServer($id)
      * reverted.
      *
      * @param  string $id
-     * @return boolean 
+     * @return boolean
      */
     public function revertResizeServer($id)
     {
@@ -728,7 +728,7 @@ public function revertResizeServer($id)
                                   'POST', null, null, json_encode($data));
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -757,9 +757,9 @@ public function revertResizeServer($id)
     }
     /**
      * Get the list of the flavors
-     * 
+     *
      * If $details is true returns detail info
-     * 
+     *
      * @param  boolean $details
      * @return array|boolean
      */
@@ -768,12 +768,12 @@ public function listFlavors($details=false)
         $url= '/flavors';
         if ($details) {
             $url.= '/detail';
-        } 
+        }
         $result= $this->httpCall($this->getManagementUrl().$url,'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $flavors= json_decode($result->getBody(),true);
                 return $flavors['flavors'];
             case '503' :
@@ -794,7 +794,7 @@ public function listFlavors($details=false)
     }
     /**
      * Get the detail of a flavor
-     * 
+     *
      * @param  string $flavorId
      * @return array|boolean
      */
@@ -807,8 +807,8 @@ public function getFlavor($flavorId)
         $result= $this->httpCall($this->getManagementUrl().'/flavors/'.rawurlencode($flavorId),'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $flavor= json_decode($result->getBody(),true);
                 return $flavor['flavor'];
             case '503' :
@@ -829,21 +829,21 @@ public function getFlavor($flavorId)
     }
     /**
      * Get the list of the images
-     * 
+     *
      * @param  boolean $details
-     * @return Zend_Service_Rackspace_Servers_ImageList|boolean 
+     * @return Zend_Service_Rackspace_Servers_ImageList|boolean
      */
     public function listImages($details=false)
     {
         $url= '/images';
         if ($details) {
             $url.= '/detail';
-        } 
+        }
         $result= $this->httpCall($this->getManagementUrl().$url,'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $images= json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_ImageList($this,$images['images']);
             case '503' :
@@ -864,7 +864,7 @@ public function listImages($details=false)
     }
     /**
      * Get detail about an image
-     * 
+     *
      * @param  string $id
      * @return Zend_Service_Rackspace_Servers_Image|boolean
      */
@@ -873,8 +873,8 @@ public function getImage($id)
         $result= $this->httpCall($this->getManagementUrl().'/images/'.rawurlencode($id),'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $image= json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_Image($this,$image['image']);
             case '503' :
@@ -898,9 +898,9 @@ public function getImage($id)
     }
     /**
      * Create an image for a serverId
-     * 
+     *
      * @param  string $serverId
-     * @param  string $name 
+     * @param  string $name
      * @return Zend_Service_Rackspace_Servers_Image
      */
     public function createImage($serverId,$name)
@@ -923,7 +923,7 @@ public function createImage($serverId,$name)
                                   null, null, json_encode($data));
         $status = $result->getStatus();
         switch ($status) {
-            case '202' : // break intentionally omitted   
+            case '202' : // break intentionally omitted
                 $image= json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_Image($this,$image['image']);
             case '503' :
@@ -953,9 +953,9 @@ public function createImage($serverId,$name)
     }
     /**
      * Delete an image
-     * 
+     *
      * @param  string $id
-     * @return boolean 
+     * @return boolean
      */
     public function deleteImage($id)
     {
@@ -966,7 +966,7 @@ public function deleteImage($id)
         $result = $this->httpCall($this->getManagementUrl().'/images/'.rawurlencode($id),'DELETE');
         $status = $result->getStatus();
         switch ($status) {
-            case '204' : // break intentionally omitted   
+            case '204' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -989,9 +989,9 @@ public function deleteImage($id)
     }
     /**
      * Get the backup schedule of a server
-     * 
+     *
      * @param  string $id server's Id
-     * @return array|boolean 
+     * @return array|boolean
      */
     public function getBackupSchedule($id)
     {
@@ -1003,8 +1003,8 @@ public function getBackupSchedule($id)
                                  'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $backup = json_decode($result->getBody(),true);
                 return $backup['backupSchedule'];
             case '503' :
@@ -1028,11 +1028,11 @@ public function getBackupSchedule($id)
     }
     /**
      * Change the backup schedule of a server
-     * 
+     *
      * @param  string $id server's Id
      * @param  string $weekly
      * @param  string $daily
-     * @return boolean 
+     * @return boolean
      */
     public function changeBackupSchedule($id,$weekly,$daily)
     {
@@ -1059,7 +1059,7 @@ public function changeBackupSchedule($id,$weekly,$daily)
                                  'POST',null,null,json_encode($data));
         $status= $result->getStatus();
         switch ($status) {
-            case '204' : // break intentionally omitted   
+            case '204' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -1085,7 +1085,7 @@ public function changeBackupSchedule($id,$weekly,$daily)
     }
     /**
      * Disable the backup schedule for a server
-     * 
+     *
      * @param  string $id server's Id
      * @return boolean
      */
@@ -1099,7 +1099,7 @@ public function disableBackupSchedule($id)
                                   'DELETE');
         $status = $result->getStatus();
         switch ($status) {
-            case '204' : // break intentionally omitted   
+            case '204' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
@@ -1125,21 +1125,21 @@ public function disableBackupSchedule($id)
     }
     /**
      * Get the list of shared IP groups
-     * 
+     *
      * @param  boolean $details
-     * @return Zend_Service_Rackspace_Servers_SharedIpGroupList|boolean 
+     * @return Zend_Service_Rackspace_Servers_SharedIpGroupList|boolean
      */
     public function listSharedIpGroups($details=false)
     {
         $url= '/shared_ip_groups';
         if ($details) {
             $url.= '/detail';
-        } 
+        }
         $result= $this->httpCall($this->getManagementUrl().$url,'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $groups= json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_SharedIpGroupList($this,$groups['sharedIpGroups']);
             case '503' :
@@ -1160,9 +1160,9 @@ public function listSharedIpGroups($details=false)
     }
     /**
      * Get the shared IP group
-     * 
+     *
      * @param  integer $id
-     * @return Zend_Service_Rackspace_Servers_SharedIpGroup|boolean 
+     * @return Zend_Service_Rackspace_Servers_SharedIpGroup|boolean
      */
     public function getSharedIpGroup($id)
     {
@@ -1173,8 +1173,8 @@ public function getSharedIpGroup($id)
         $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups/'.rawurlencode($id),'GET');
         $status= $result->getStatus();
         switch ($status) {
-            case '200' : 
-            case '203' : // break intentionally omitted   
+            case '200' :
+            case '203' : // break intentionally omitted
                 $group= json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_SharedIpGroup($this,$group['sharedIpGroup']);
             case '503' :
@@ -1198,10 +1198,10 @@ public function getSharedIpGroup($id)
     }
     /**
      * Create a shared Ip group
-     * 
+     *
      * @param  string $name
      * @param  string $serverId
-     * @return array|boolean 
+     * @return array|boolean
      */
     public function createSharedIpGroup($name,$serverId)
     {
@@ -1223,7 +1223,7 @@ public function createSharedIpGroup($name,$serverId)
                                  'POST',null,null,json_encode($data));
         $status= $result->getStatus();
         switch ($status) {
-            case '201' : // break intentionally omitted   
+            case '201' : // break intentionally omitted
                 $group = json_decode($result->getBody(),true);
                 return new Zend_Service_Rackspace_Servers_SharedIpGroup($this,$group['sharedIpGroup']);
             case '503' :
@@ -1244,8 +1244,8 @@ public function createSharedIpGroup($name,$serverId)
     }
     /**
      * Delete a Shared Ip Group
-     * 
-     * @param  integer $id 
+     *
+     * @param  integer $id
      * @return boolean
      */
     public function deleteSharedIpGroup($id)
@@ -1257,7 +1257,7 @@ public function deleteSharedIpGroup($id)
         $result= $this->httpCall($this->getManagementUrl().'/shared_ip_groups/'.rawurlencode($id),'DELETE');
         $status= $result->getStatus();
         switch ($status) {
-            case '204' : // break intentionally omitted   
+            case '204' : // break intentionally omitted
                 return true;
             case '503' :
                 $this->errorMsg= self::ERROR_SERVICE_UNAVAILABLE;
diff --git a/lib/Zend/Service/Rackspace/Servers/Image.php b/lib/Zend/Service/Rackspace/Servers/Image.php
index 96d65c0b25c..7f5fedadff3 100644
--- a/lib/Zend/Service/Rackspace/Servers/Image.php
+++ b/lib/Zend/Service/Rackspace/Servers/Image.php
@@ -29,44 +29,44 @@ class Zend_Service_Rackspace_Servers_Image
     const ERROR_PARAM_NO_ID     = 'You must pass the image\'s id in the array (id)';
     /**
      * Name of the image
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $name;
     /**
      * Id of the image
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $id;
     /**
      * Server Id of the image
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $serverId;
     /**
      * Updated data
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $updated;
     /**
      * Created data
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $created;
     /**
      * Status
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $status;
     /**
      * Status progress
-     * 
-     * @var integer 
+     *
+     * @var integer
      */
     protected $progress;
     /**
@@ -77,7 +77,7 @@ class Zend_Service_Rackspace_Servers_Image
     protected $service;
     /**
      * Construct
-     * 
+     *
      * @param array $data
      * @return void
      */
@@ -125,8 +125,8 @@ public function getName()
     }
     /**
      * Get the image's id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getId()
     {
@@ -134,8 +134,8 @@ public function getId()
     }
     /**
      * Get the server's id of the image
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getServerId()
     {
@@ -143,8 +143,8 @@ public function getServerId()
     }
     /**
      * Get the updated data
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getUpdated()
     {
@@ -152,8 +152,8 @@ public function getUpdated()
     }
     /**
      * Get the created data
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getCreated()
     {
@@ -161,7 +161,7 @@ public function getCreated()
     }
     /**
      * Get the image's status
-     * 
+     *
      * @return string|boolean
      */
     public function getStatus()
@@ -176,7 +176,7 @@ public function getStatus()
     }
     /**
      * Get the progress's status
-     * 
+     *
      * @return integer|boolean
      */
     public function getProgress()
@@ -191,8 +191,8 @@ public function getProgress()
     }
     /**
      * To Array
-     * 
-     * @return array 
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/lib/Zend/Service/Rackspace/Servers/ImageList.php b/lib/Zend/Service/Rackspace/Servers/ImageList.php
index 56d11f09ca3..13c0b51512d 100644
--- a/lib/Zend/Service/Rackspace/Servers/ImageList.php
+++ b/lib/Zend/Service/Rackspace/Servers/ImageList.php
@@ -90,8 +90,8 @@ protected function addImage (Zend_Service_Rackspace_Servers_Image $image)
     }
     /**
      * To Array
-     * 
-     * @return array 
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/lib/Zend/Service/Rackspace/Servers/Server.php b/lib/Zend/Service/Rackspace/Servers/Server.php
index 49da31280ef..cb1b88bbc8a 100644
--- a/lib/Zend/Service/Rackspace/Servers/Server.php
+++ b/lib/Zend/Service/Rackspace/Servers/Server.php
@@ -29,7 +29,7 @@ class Zend_Service_Rackspace_Servers_Server
     const ERROR_PARAM_NO_ID     = 'You must pass the server\'s id in the array (id)';
     /**
      * Server's name
-     * 
+     *
      * @var string
      */
     protected $name;
@@ -47,38 +47,38 @@ class Zend_Service_Rackspace_Servers_Server
     protected $imageId;
     /**
      * Flavor id of the server
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $flavorId;
     /**
      * Host id
-     * 
+     *
      * @var string
      */
     protected $hostId;
     /**
      * Server's status
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $status;
     /**
      * Progress of the status
-     * 
+     *
      * @var integer
      */
     protected $progress;
     /**
      * Admin password, generated on a new server
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $adminPass;
     /**
      * Public and private IP addresses
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $addresses = array();
     /**
@@ -138,7 +138,7 @@ public function __construct($service, $data)
         }
         if (isset($data['metadata']) && is_array($data['metadata'])) {
             $this->metadata= $data['metadata'];
-        } 
+        }
     }
     /**
      * Get the name of the server
@@ -151,8 +151,8 @@ public function getName()
     }
     /**
      * Get the server's id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getId()
     {
@@ -160,8 +160,8 @@ public function getId()
     }
     /**
      * Get the server's image Id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getImageId()
     {
@@ -169,8 +169,8 @@ public function getImageId()
     }
     /**
      * Get the server's flavor Id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getFlavorId()
     {
@@ -178,8 +178,8 @@ public function getFlavorId()
     }
     /**
      * Get the server's host Id
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getHostId()
     {
@@ -187,8 +187,8 @@ public function getHostId()
     }
     /**
      * Ge the server's admin password
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getAdminPass()
     {
@@ -196,7 +196,7 @@ public function getAdminPass()
     }
     /**
      * Get the server's status
-     * 
+     *
      * @return string|boolean
      */
     public function getStatus()
@@ -211,7 +211,7 @@ public function getStatus()
     }
     /**
      * Get the progress's status
-     * 
+     *
      * @return integer|boolean
      */
     public function getProgress()
@@ -226,7 +226,7 @@ public function getProgress()
     }
     /**
      * Get the private IPs
-     * 
+     *
      * @return array|boolean
      */
     public function getPrivateIp()
@@ -238,7 +238,7 @@ public function getPrivateIp()
     }
     /**
      * Get the public IPs
-     * 
+     *
      * @return array|boolean
      */
     public function getPublicIp()
@@ -265,11 +265,11 @@ public function getMetadata($key=null)
     }
     /**
      * Change the name of the server
-     * 
+     *
      * @param string $name
-     * @return boolean 
+     * @return boolean
      */
-    public function changeName($name) 
+    public function changeName($name)
     {
         $result= $this->service->changeServerName($this->id, $name);
         if ($result!==false) {
@@ -280,9 +280,9 @@ public function changeName($name)
     }
     /**
      * Change the admin password of the server
-     * 
+     *
      * @param string $password
-     * @return boolean 
+     * @return boolean
      */
     public function changePassword($password)
     {
@@ -295,8 +295,8 @@ public function changePassword($password)
     }
     /**
      * Reboot the server
-     * 
-     * @return boolean 
+     *
+     * @return boolean
      */
     public function reboot($hard=false)
     {
@@ -304,8 +304,8 @@ public function reboot($hard=false)
     }
     /**
      * To Array
-     * 
-     * @return array 
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/lib/Zend/Service/Rackspace/Servers/ServerList.php b/lib/Zend/Service/Rackspace/Servers/ServerList.php
index a16a46efb36..d972744eb1f 100644
--- a/lib/Zend/Service/Rackspace/Servers/ServerList.php
+++ b/lib/Zend/Service/Rackspace/Servers/ServerList.php
@@ -91,8 +91,8 @@ protected function addServer (Zend_Service_Rackspace_Servers_Server $server)
     }
     /**
      * To Array
-     * 
-     * @return array 
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php b/lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php
index 99c2ac2ab42..461682ad69c 100644
--- a/lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php
+++ b/lib/Zend/Service/Rackspace/Servers/SharedIpGroup.php
@@ -30,20 +30,20 @@ class Zend_Service_Rackspace_Servers_SharedIpGroup
     const ERROR_PARAM_NO_SERVERS = 'The servers parameter must be an array of Ids';
     /**
      * Name of the shared IP group
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $name;
     /**
      * Id of the shared IP group
-     * 
-     * @var string 
+     *
+     * @var string
      */
     protected $id;
     /**
      * Array of servers of the shared IP group
-     * 
-     * @var array 
+     *
+     * @var array
      */
     protected $serversId = array();
     /**
@@ -54,7 +54,7 @@ class Zend_Service_Rackspace_Servers_SharedIpGroup
     protected $service;
     /**
      * Construct
-     * 
+     *
      * @param  Zend_Service_Rackspace_Servers $service
      * @param  array $data
      * @return void
@@ -76,13 +76,13 @@ public function __construct($service, $data)
         if (isset($data['servers']) && !is_array($data['servers'])) {
             #require_once 'Zend/Service/Rackspace/Servers/Exception.php';
             throw new Zend_Service_Rackspace_Servers_Exception(self::ERROR_PARAM_NO_SERVERS);
-        } 
+        }
         $this->service= $service;
         $this->name = $data['name'];
         $this->id = $data['id'];
         if (isset($data['servers'])) {
             $this->serversId= $data['servers'];
-        }    
+        }
     }
     /**
      * Get the name of the shared IP group
@@ -95,8 +95,8 @@ public function getName()
     }
     /**
      * Get the id of the shared IP group
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getId()
     {
@@ -104,8 +104,8 @@ public function getId()
     }
     /**
      * Get the server's array of the shared IP group
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getServersId()
     {
@@ -116,13 +116,13 @@ public function getServersId()
                 if (isset($info['servers'])) {
                     $this->serversId= $info['servers'];
                 }
-            }    
+            }
         }
         return $this->serversId;
     }
     /**
-     * Get the server 
-     * 
+     * Get the server
+     *
      * @param integer $id
      * @return Zend_Service_Rackspace_Servers_Server|boolean
      */
@@ -138,21 +138,21 @@ public function getServer($id)
     }
     /**
      * Create a server in the shared Ip Group
-     * 
+     *
      * @param  array $data
      * @param  array $metadata
-     * @param  array $files 
+     * @param  array $files
      * @return Zend_Service_Rackspace_Servers_Server|boolean
      */
-    public function createServer(array $data, $metadata=array(),$files=array()) 
+    public function createServer(array $data, $metadata=array(),$files=array())
     {
         $data['sharedIpGroupId']= (integer) $this->id;
         return $this->service->createServer($data,$metadata,$files);
     }
     /**
      * To Array
-     * 
-     * @return array 
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php b/lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
index 043fbbf278f..abd50041740 100644
--- a/lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
+++ b/lib/Zend/Service/Rackspace/Servers/SharedIpGroupList.php
@@ -90,8 +90,8 @@ protected function addSharedIpGroup (Zend_Service_Rackspace_Servers_SharedIpGrou
     }
     /**
      * To Array
-     * 
-     * @return array 
+     *
+     * @return array
      */
     public function toArray()
     {
diff --git a/lib/Zend/Service/SqlAzure/Management/Client.php b/lib/Zend/Service/SqlAzure/Management/Client.php
index b24a414e160..786db0b3999 100644
--- a/lib/Zend/Service/SqlAzure/Management/Client.php
+++ b/lib/Zend/Service/SqlAzure/Management/Client.php
@@ -24,17 +24,17 @@
  * @see Zend_Http_Client
  */
  #require_once 'Zend/Http/Client.php';
- 
+
  /**
  * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
  */
  #require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
- 
+
  /**
  * @see Zend_Service_SqlAzure_Management_ServerInstance
  */
  #require_once 'Zend/Service/SqlAzure/Management/ServerInstance.php';
- 
+
  /**
  * @see Zend_Service_SqlAzure_Management_FirewallRuleInstance
  */
@@ -56,7 +56,7 @@ class Zend_Service_SqlAzure_Management_Client
 	 * Management service URL
 	 */
 	const URL_MANAGEMENT        = "https://management.database.windows.net:8443";
-	
+
 	/**
 	 * Operations
 	 */
@@ -66,56 +66,56 @@ class Zend_Service_SqlAzure_Management_Client
 
 	/**
 	 * Current API version
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_apiVersion = '1.0';
-	
+
 	/**
 	 * Subscription ID
 	 *
 	 * @var string
 	 */
 	protected $_subscriptionId = '';
-	
+
 	/**
 	 * Management certificate path (.PEM)
 	 *
 	 * @var string
 	 */
 	protected $_certificatePath = '';
-	
+
 	/**
 	 * Management certificate passphrase
 	 *
 	 * @var string
 	 */
 	protected $_certificatePassphrase = '';
-	
+
 	/**
 	 * Zend_Http_Client channel used for communication with REST services
-	 * 
+	 *
 	 * @var Zend_Http_Client
 	 */
-	protected $_httpClientChannel = null;	
+	protected $_httpClientChannel = null;
 
 	/**
 	 * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance
-	 * 
+	 *
 	 * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
 	 */
 	protected $_retryPolicy = null;
-	
+
 	/**
 	 * Returns the last request ID
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_lastRequestId = null;
-	
+
 	/**
 	 * Creates a new Zend_Service_SqlAzure_Management instance
-	 * 
+	 *
 	 * @param string $subscriptionId Subscription ID
 	 * @param string $certificatePath Management certificate path (.PEM)
 	 * @param string $certificatePassphrase Management certificate passphrase
@@ -130,12 +130,12 @@ public function __construct(
 		$this->_subscriptionId = $subscriptionId;
 		$this->_certificatePath = $certificatePath;
 		$this->_certificatePassphrase = $certificatePassphrase;
-		
+
 		$this->_retryPolicy = $retryPolicy;
 		if (is_null($this->_retryPolicy)) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
-		
+
 		// Setup default Zend_Http_Client channel
 		$options = array(
 		    'adapter'       => 'Zend_Http_Client_Adapter_Socket',
@@ -153,47 +153,47 @@ public function __construct(
 		}
 		$this->_httpClientChannel = new Zend_Http_Client(null, $options);
 	}
-	
+
 	/**
 	 * Set the HTTP client channel to use
-	 * 
+	 *
 	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
 	 */
 	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Socket')
 	{
 		$this->_httpClientChannel->setAdapter($adapterInstance);
 	}
-	
+
     /**
      * Retrieve HTTP client channel
-     * 
+     *
      * @return Zend_Http_Client_Adapter_Interface
      */
     public function getHttpClientChannel()
     {
         return $this->_httpClientChannel;
     }
-	
+
 	/**
 	 * Returns the Windows Azure subscription ID
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getSubscriptionId()
 	{
 		return $this->_subscriptionId;
 	}
-	
+
 	/**
 	 * Returns the last request ID.
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getLastRequestId()
 	{
 		return $this->_lastRequestId;
 	}
-	
+
 	/**
 	 * Get base URL for creating requests
 	 *
@@ -203,7 +203,7 @@ public function getBaseUrl()
 	{
 		return self::URL_MANAGEMENT . '/' . $this->_subscriptionId;
 	}
-	
+
 	/**
 	 * Perform request using Zend_Http_Client channel
 	 *
@@ -225,12 +225,12 @@ protected function _performRequest(
 		if (strpos($path, '/') !== 0) {
 			$path = '/' . $path;
 		}
-			
+
 		// Clean headers
 		if (is_null($headers)) {
 		    $headers = array();
 		}
-		
+
 		// Ensure cUrl will also work correctly:
 		//  - disable Content-Type if required
 		//  - disable Expect: 100 Continue
@@ -241,7 +241,7 @@ protected function _performRequest(
 
 		// Add version header
 		$headers['x-ms-version'] = $this->_apiVersion;
-		    
+
 		// URL encoding
 		$path           = self::urlencode($path);
 		$queryString    = self::urlencode($queryString);
@@ -250,7 +250,7 @@ protected function _performRequest(
 		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
 		$requestHeaders = $headers;
 
-		// Prepare request 
+		// Prepare request
 		$this->_httpClientChannel->resetParameters(true);
 		$this->_httpClientChannel->setUri($requestUrl);
 		$this->_httpClientChannel->setHeaders($requestHeaders);
@@ -261,14 +261,14 @@ protected function _performRequest(
 		    array($this->_httpClientChannel, 'request'),
 		    array($httpVerb)
 		);
-		
+
 		// Store request id
 		$this->_lastRequestId = $response->getHeader('x-ms-request-id');
-		
+
 		return $response;
 	}
-	
-	/** 
+
+	/**
 	 * Parse result from Zend_Http_Response
 	 *
 	 * @param Zend_Http_Response $response Response from HTTP call
@@ -281,27 +281,27 @@ protected function _parseResponse(Zend_Http_Response $response = null)
 			#require_once 'Zend/Service/SqlAzure/Exception.php';
 			throw new Zend_Service_SqlAzure_Exception('Response should not be null.');
 		}
-		
+
         $xml = @Zend_Xml_Security::scan($response->getBody());
-        
+
         if ($xml !== false) {
-            // Fetch all namespaces 
-            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); 
-            
+            // Fetch all namespaces
+            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true));
+
             // Register all namespace prefixes
-            foreach ($namespaces as $prefix => $ns) { 
+            foreach ($namespaces as $prefix => $ns) {
                 if ($prefix != '') {
                     $xml->registerXPathNamespace($prefix, $ns);
-                } 
-            } 
+                }
+            }
         }
-        
+
         return $xml;
 	}
-	
+
 	/**
 	 * URL encode function
-	 * 
+	 *
 	 * @param  string $value Value to encode
 	 * @return string        Encoded value
 	 */
@@ -309,10 +309,10 @@ public static function urlencode($value)
 	{
 	    return str_replace(' ', '%20', $value);
 	}
-	
+
     /**
      * Builds a query string from an array of elements
-     * 
+     *
      * @param array     Array of elements
      * @return string   Assembled query string
      */
@@ -320,7 +320,7 @@ public static function createQueryStringFromArray($queryString)
     {
     	return count($queryString) > 0 ? '?' . implode('&', $queryString) : '';
     }
-    
+
 	/**
 	 * Get error message from Zend_Http_Response
 	 *
@@ -337,10 +337,10 @@ protected function _getErrorMessage(Zend_Http_Response $response, $alternativeEr
 			return $alternativeError;
 		}
 	}
-	
+
 	/**
 	 * The Create Server operation adds a new SQL Azure server to a subscription.
-	 * 
+	 *
 	 * @param string $administratorLogin Administrator login.
 	 * @param string $administratorPassword Administrator password.
 	 * @param string $location Location of the server.
@@ -361,15 +361,15 @@ public function createServer($administratorLogin, $administratorPassword, $locat
                     #require_once 'Zend/Service/SqlAzure/Management/Exception.php';
                     throw new Zend_Service_SqlAzure_Management_Exception('Please specify a location for the server.');
                 }
-    	
+
                 $response = $this->_performRequest(self::OP_SERVERS, '',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<Server xmlns="http://schemas.microsoft.com/sqlazure/2010/12/"><AdministratorLogin>' . $administratorLogin . '</AdministratorLogin><AdministratorLoginPassword>' . $administratorPassword . '</AdministratorLoginPassword><Location>' . $location . '</Location></Server>');
- 	
+
                 if ($response->isSuccessful()) {
 			$xml = $this->_parseResponse($response);
-			
+
 			return new Zend_Service_SqlAzure_Management_ServerInstance(
 				(string)$xml,
 				$administratorLogin,
@@ -378,23 +378,23 @@ public function createServer($administratorLogin, $administratorPassword, $locat
                 } else {
 			#require_once 'Zend/Service/SqlAzure/Management/Exception.php';
 			throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}	
+		}
 	}
-	
+
 	/**
 	 * The Get Servers operation enumerates SQL Azure servers that are provisioned for a subscription.
-	 * 
+	 *
 	 * @return array An array of Zend_Service_SqlAzure_Management_ServerInstance.
 	 * @throws Zend_Service_SqlAzure_Management_Exception
 	 */
 	public function listServers()
 	{
             $response = $this->_performRequest(self::OP_SERVERS);
- 	
+
             if ($response->isSuccessful()) {
 		$xml = $this->_parseResponse($response);
 		$xmlServices = null;
-			
+
                 if (!$xml->Server) {
                     return array();
 		}
@@ -403,10 +403,10 @@ public function listServers()
     		} else {
     		    $xmlServices = array($xml->Server);
     		}
-    		
+
 		$services = array();
-		if (!is_null($xmlServices)) {				
-				
+		if (!is_null($xmlServices)) {
+
                     for ($i = 0; $i < count($xmlServices); $i++) {
                         $services[] = new Zend_Service_SqlAzure_Management_ServerInstance(
                                 	    (string)$xmlServices[$i]->Name,
@@ -421,10 +421,10 @@ public function listServers()
 		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
             }
 	}
-	
+
 	/**
 	 * The Drop Server operation drops a SQL Azure server from a subscription.
-	 * 
+	 *
 	 * @param string $serverName Server to drop.
 	 * @throws Zend_Service_SqlAzure_Management_Exception
 	 */
@@ -434,18 +434,18 @@ public function dropServer($serverName)
                 #require_once 'Zend/Service/SqlAzure/Management/Exception.php';
                 throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
             }
-    	
+
             $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName, '', Zend_Http_Client::DELETE);
 
             if (!$response->isSuccessful()) {
 		#require_once 'Zend/Service/SqlAzure/Management/Exception.php';
 		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-            }	
+            }
 	}
-	
+
 	/**
 	 * The Set Server Administrator Password operation sets the administrative password of a SQL Azure server for a subscription.
-	 * 
+	 *
 	 * @param string $serverName Server to set password for.
 	 * @param string $administratorPassword Administrator password.
 	 * @throws Zend_Service_SqlAzure_Management_Exception
@@ -460,21 +460,21 @@ public function setAdministratorPassword($serverName, $administratorPassword)
                 #require_once 'Zend/Service/SqlAzure/Management/Exception.php';
     		throw new Zend_Service_SqlAzure_Management_Exception('Administrator password should be specified.');
             }
-    	
+
             $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName, '?op=ResetPassword',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<AdministratorLoginPassword xmlns="http://schemas.microsoft.com/sqlazure/2010/12/">' . $administratorPassword . '</AdministratorLoginPassword>');
-    		
+
             if (!$response->isSuccessful()) {
 		#require_once 'Zend/Service/SqlAzure/Management/Exception.php';
 		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-            }	
+            }
 	}
-	
+
 	/**
 	 * The Set Server Firewall Rule operation updates an existing firewall rule or adds a new firewall rule for a SQL Azure server that belongs to a subscription.
-	 * 
+	 *
 	 * @param string $serverName Server name.
 	 * @param string $ruleName Firewall rule name.
 	 * @param string $startIpAddress Start IP address.
@@ -500,14 +500,14 @@ public function createFirewallRule($serverName, $ruleName, $startIpAddress, $end
                 #require_once 'Zend/Service/SqlAzure/Management/Exception.php';
                 throw new Zend_Service_SqlAzure_Management_Exception('End IP address should be specified.');
             }
-    	
+
             $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES . '/' . $ruleName, '',
     		Zend_Http_Client::PUT,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<FirewallRule xmlns="http://schemas.microsoft.com/sqlazure/2010/12/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.microsoft.com/sqlazure/2010/12/ FirewallRule.xsd"><StartIpAddress>' . $startIpAddress . '</StartIpAddress><EndIpAddress>' . $endIpAddress . '</EndIpAddress></FirewallRule>');
 
             if ($response->isSuccessful()) {
-		
+
     		return new Zend_Service_SqlAzure_Management_FirewallRuleInstance(
     			$ruleName,
     			$startIpAddress,
@@ -518,10 +518,10 @@ public function createFirewallRule($serverName, $ruleName, $startIpAddress, $end
 		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
             }
 	}
-	
+
 	/**
 	 * The Get Server Firewall Rules operation retrieves a list of all the firewall rules for a SQL Azure server that belongs to a subscription.
-	 * 
+	 *
 	 * @param string $serverName Server name.
 	 * @return Array of Zend_Service_SqlAzure_Management_FirewallRuleInstance.
 	 * @throws Zend_Service_SqlAzure_Management_Exception
@@ -532,13 +532,13 @@ public function listFirewallRules($serverName)
 		#require_once 'Zend/Service/SqlAzure/Management/Exception.php';
                 throw new Zend_Service_SqlAzure_Management_Exception('Server name should be specified.');
             }
-    	
+
 	    $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES);
- 	
+
             if ($response->isSuccessful()) {
 		$xml = $this->_parseResponse($response);
 		$xmlServices = null;
-			
+
     		if (!$xml->FirewallRule) {
                     return array();
 		}
@@ -547,10 +547,10 @@ public function listFirewallRules($serverName)
     		} else {
     		    $xmlServices = array($xml->FirewallRule);
     		}
-    		
+
 		$services = array();
-		if (!is_null($xmlServices)) {				
-                    
+		if (!is_null($xmlServices)) {
+
                     for ($i = 0; $i < count($xmlServices); $i++) {
                         $services[] = new Zend_Service_SqlAzure_Management_FirewallRuleInstance(
 					    (string)$xmlServices[$i]->Name,
@@ -563,12 +563,12 @@ public function listFirewallRules($serverName)
             } else {
 		#require_once 'Zend/Service/SqlAzure/Management/Exception.php';
 		throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-            }		
+            }
 	}
-	
+
 	/**
 	 * The Delete Server Firewall Rule operation deletes a firewall rule from a SQL Azure server that belongs to a subscription.
-	 * 
+	 *
 	 * @param string $serverName Server name.
 	 * @param string $ruleName Rule name.
 	 * @throws Zend_Service_SqlAzure_Management_Exception
@@ -583,7 +583,7 @@ public function deleteFirewallRule($serverName, $ruleName)
 			#require_once 'Zend/Service/SqlAzure/Management/Exception.php';
     		throw new Zend_Service_SqlAzure_Management_Exception('Rule name should be specified.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_SERVERS . '/' . $serverName . '/' . self::OP_FIREWALLRULES . '/' . $ruleName, '',
     		Zend_Http_Client::DELETE);
 
@@ -592,10 +592,10 @@ public function deleteFirewallRule($serverName, $ruleName)
 			throw new Zend_Service_SqlAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Creates a firewall rule for Microsoft Services. This is required if access to SQL Azure is required from other services like Windows Azure.
-	 * 
+	 *
 	 * @param string $serverName Server name.
 	 * @param boolean $allowAccess Allow access from other Microsoft Services?
 	 * @throws Zend_Service_SqlAzure_Management_Exception
@@ -608,5 +608,5 @@ public function createFirewallRuleForMicrosoftServices($serverName, $allowAccess
 			$this->deleteFirewallRule($serverName, 'MicrosoftServices');
 		}
 	}
-	
+
 }
diff --git a/lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php b/lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php
index df038f7fd2b..6e17faea305 100644
--- a/lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php
+++ b/lib/Zend/Service/SqlAzure/Management/FirewallRuleInstance.php
@@ -31,27 +31,27 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Name               The name of the firewall rule.
  * @property string $StartIpAddress     The start IP address.
  * @property string $EndIpAddress       The end IP address.
  */
 class Zend_Service_SqlAzure_Management_FirewallRuleInstance
 	extends Zend_Service_SqlAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $name               The name of the firewall rule.
      * @param string $startIpAddress     The start IP address.
      * @param string $endIpAddress       The end IP address.
 	 */
-    public function __construct($name, $startIpAddress, $endIpAddress) 
-    {	        
+    public function __construct($name, $startIpAddress, $endIpAddress)
+    {
         $this->_data = array(
             'name'               => $name,
             'startipaddress'     => $startIpAddress,
-            'endipaddress'       => $endIpAddress       
+            'endipaddress'       => $endIpAddress
         );
     }
 }
diff --git a/lib/Zend/Service/SqlAzure/Management/ServerInstance.php b/lib/Zend/Service/SqlAzure/Management/ServerInstance.php
index 6ac9f5a92d3..86ee93d528a 100644
--- a/lib/Zend/Service/SqlAzure/Management/ServerInstance.php
+++ b/lib/Zend/Service/SqlAzure/Management/ServerInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Name               The name of the server.
  * @property string $DnsName            The DNS name of the server.
  * @property string $AdministratorLogin The administrator login.
@@ -39,21 +39,21 @@
  */
 class Zend_Service_SqlAzure_Management_ServerInstance
 	extends Zend_Service_SqlAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $name               The name of the server.
      * @param string $administratorLogin The administrator login.
      * @param string $location           The location of the server in Windows Azure.
 	 */
-    public function __construct($name, $administratorLogin, $location) 
-    {	        
+    public function __construct($name, $administratorLogin, $location)
+    {
         $this->_data = array(
             'name'               => $name,
             'dnsname'            => $name . '.database.windows.net',
             'administratorlogin' => $administratorLogin,
-            'location'           => $location       
+            'location'           => $location
         );
     }
 }
diff --git a/lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php b/lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php
index d586a06db1d..338931defb3 100644
--- a/lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php
+++ b/lib/Zend/Service/SqlAzure/Management/ServiceEntityAbstract.php
@@ -32,14 +32,14 @@ abstract class Zend_Service_SqlAzure_Management_ServiceEntityAbstract
 {
     /**
      * Data
-     * 
+     *
      * @var array
      */
     protected $_data = null;
-    
+
     /**
      * Magic overload for setting properties
-     * 
+     *
      * @param string $name     Name of the property
      * @param string $value    Value to set
      */
@@ -54,7 +54,7 @@ public function __set($name, $value) {
 
     /**
      * Magic overload for getting properties
-     * 
+     *
      * @param string $name     Name of the property
      */
     public function __get($name) {
diff --git a/lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php b/lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
index 113e7beb329..20be994cad5 100644
--- a/lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
@@ -24,7 +24,7 @@
  * @package    Zend_Service_WindowsAzure_CommandLine
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
+ */
 abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageScaffolderAbstract
 {
 	/**
@@ -35,10 +35,10 @@ abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageSc
 	 * @param array $options Options array (key/value).
 	 */
 	abstract public function invoke(Phar $phar, $rootPath, $options = array());
-	
+
 	/**
 	 * Writes output to STDERR, followed by a newline (optional)
-	 * 
+	 *
 	 * @param string $message
 	 * @param string $newLine
 	 */
@@ -49,10 +49,10 @@ protected function log($message, $newLine = true)
 		}
 		file_put_contents('php://stderr', $message . ($newLine ? "\r\n" : ''));
 	}
-	
+
 	/**
 	 * Extract resources to a file system path
-	 * 
+	 *
 	 * @param Phar $phar Phar archive.
 	 * @param string $path Output path root.
 	 */
@@ -65,10 +65,10 @@ protected function extractResources(Phar $phar, $path)
 		$this->copyDirectory($path . '/resources', $path, false);
 		$this->deleteDirectory($path . '/resources');
 	}
-	
+
 	/**
 	 * Apply file transforms.
-	 * 
+	 *
 	 * @param string $rootPath Root path.
 	 * @param array $values Key/value array.
 	 */
@@ -77,15 +77,15 @@ protected function applyTransforms($rootPath, $values)
         if (is_null($rootPath) || !is_string($rootPath) || empty($rootPath)) {
             throw new InvalidArgumentException("Undefined \"rootPath\"");
         }
-                        
+
         if (is_dir($rootPath)) {
             $d = dir($rootPath);
             while ( false !== ( $entry = $d->read() ) ) {
                 if ( $entry == '.' || $entry == '..' ) {
                     continue;
                 }
-                $entry = $rootPath . '/' . $entry; 
-                
+                $entry = $rootPath . '/' . $entry;
+
                 $this->applyTransforms($entry, $values);
             }
             $d->close();
@@ -96,50 +96,50 @@ protected function applyTransforms($rootPath, $values)
         	}
             file_put_contents($rootPath, $contents);
         }
-        
+
         return true;
 	}
-	
+
 	/**
      * Create directory
-     * 
+     *
      * @param string  $path           Path of directory to create.
      * @param boolean $abortIfExists  Abort if directory exists.
      * @param boolean $recursive      Create parent directories if not exist.
-     * 
+     *
      * @return boolean
      */
     protected function createDirectory($path, $abortIfExists = true, $recursive = true) {
         if (is_null($path) || !is_string($path) || empty($path)) {
-            throw new InvalidArgumentException ("Undefined \"path\"" );        
+            throw new InvalidArgumentException ("Undefined \"path\"" );
         }
-                
+
         if (is_dir($path) && $abortIfExists) {
-            return false;       
+            return false;
         }
-        
+
         if (is_dir($path) ) {
             @chmod($path, '0775');
             if (!self::deleteDirectory($path) ) {
                 throw new RuntimeException("Failed to delete \"{$path}\".");
             }
         }
-            
+
         if (!mkdir($path, '0775', $recursive) || !is_dir($path)) {
             throw new RuntimeException( "Failed to create directory \"{$path}\"." );
         }
 
         return true;
     }
-    
+
     /**
      * Fully copy a source directory to a target directory.
-     * 
+     *
      * @param string  $sourcePath   Source directory
      * @param string  $destinationPath   Target directory
      * @param boolean $abortIfExists Query re-creating target directory if exists
      * @param octal   $mode           Changes access mode
-     * 
+     *
      * @return boolean
      */
     protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists = true, $mode = '0775') {
@@ -148,15 +148,15 @@ protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists =
         if (is_null($sourcePath) || !is_string($sourcePath) || empty($sourcePath)) {
             throw new InvalidArgumentException("Undefined \"sourcePath\"");
         }
-        
+
         if (is_null($destinationPath) || !is_string($destinationPath) || empty($destinationPath)) {
         	throw new InvalidArgumentException("Undefined \"destinationPath\"");
         }
-                    
+
         if (is_dir($destinationPath) && $abortIfExists) {
             return false;
         }
-                        
+
         if (is_dir($sourcePath)) {
             if (!is_dir($destinationPath) && !mkdir($destinationPath, $mode)) {
                 throw new RuntimeException("Failed to create target directory \"{$destinationPath}\"" );
@@ -166,13 +166,13 @@ protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists =
                 if ( $entry == '.' || $entry == '..' ) {
                     continue;
                 }
-                $strSourceEntry = $sourcePath . '/' . $entry; 
+                $strSourceEntry = $sourcePath . '/' . $entry;
                 $strTargetEntry = $destinationPath . '/' . $entry;
                 if (is_dir($strSourceEntry) ) {
                     $this->copyDirectory(
-                    	$strSourceEntry, 
-                    	$strTargetEntry, 
-                    	false, 
+                    	$strSourceEntry,
+                    	$strTargetEntry,
+                    	false,
                     	$mode
                     );
                     continue;
@@ -181,7 +181,7 @@ protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists =
                     throw new RuntimeException (
                         "Failed to copy"
                         . " file \"{$strSourceEntry}\""
-                        . " to \"{$strTargetEntry}\"" 
+                        . " to \"{$strTargetEntry}\""
                     );
                 }
             }
@@ -191,29 +191,29 @@ protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists =
                 throw new RuntimeException (
                     "Failed to copy"
                     . " file \"{$sourcePath}\""
-                    . " to \"{$destinationPath}\"" 
-                    
+                    . " to \"{$destinationPath}\""
+
                 );
             }
         }
-        
+
         return true;
     }
-    
+
     /**
      * Delete directory and all of its contents;
-     * 
+     *
      * @param string $path Directory path
      * @return boolean
      */
-    protected function deleteDirectory($path) 
+    protected function deleteDirectory($path)
     {
         if (is_null($path) || !is_string($path) || empty($path)) {
-            throw new InvalidArgumentException( "Undefined \"path\"" );        
+            throw new InvalidArgumentException( "Undefined \"path\"" );
         }
-        
+
         $handleDir = false;
-        if (is_dir($path) ) {    
+        if (is_dir($path) ) {
             $handleDir = @opendir($path);
         }
         if (!$handleDir) {
@@ -224,28 +224,28 @@ protected function deleteDirectory($path)
             if ($file == '.' || $file == '..') {
                 continue;
             }
-            
+
             $fsEntity = $path . "/" . $file;
-            
+
             if (is_dir($fsEntity)) {
                 $this->deleteDirectory($fsEntity);
                 continue;
             }
-            
+
             if (is_file($fsEntity)) {
                 @unlink($fsEntity);
                 continue;
             }
-            
+
             throw new LogicException (
-                "Unexpected file type: \"{$fsEntity}\"" 
+                "Unexpected file type: \"{$fsEntity}\""
             );
         }
-        
-        @chmod($path, 0775);        
+
+        @chmod($path, 0775);
         closedir($handleDir);
         @rmdir($path);
-                     
+
         return true;
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php b/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php
index 44b7d5a7e60..0ebc4e8832c 100644
--- a/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php
+++ b/lib/Zend/Service/WindowsAzure/CommandLine/Scaffolders/DefaultScaffolder/index.php
@@ -25,7 +25,7 @@
  * @package    Zend_Service_WindowsAzure_CommandLine
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
+ */
 class Scaffolder
 	extends Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageScaffolderAbstract
 {
@@ -43,18 +43,18 @@ public function invoke(Phar $phar, $rootPath, $options = array())
 			#require_once 'Zend/Service/Console/Exception.php';
 			throw new Zend_Service_Console_Exception('Missing argument for scaffolder: DiagnosticsConnectionString');
 		}
-		
+
 		// Extract to disk
 		$this->log('Extracting resources...');
 		$this->createDirectory($rootPath);
 		$this->extractResources($phar, $rootPath);
 		$this->log('Extracted resources.');
-		
+
 		// Apply transforms
 		$this->log('Applying transforms...');
 		$this->applyTransforms($rootPath, $options);
 		$this->log('Applied transforms.');
-		
+
 		// Show "to do" message
 		$contentRoot = realpath($rootPath . '/PhpOnAzure.Web');
 		echo "\r\n";
diff --git a/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php b/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
index 76893c980a4..3edecd6d722 100644
--- a/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
@@ -25,7 +25,7 @@
  * @package    Zend_Service_WindowsAzure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
+ */
 abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 {
 	/**
@@ -33,14 +33,14 @@ abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 	 */
 	const DEVSTORE_ACCOUNT       = "devstoreaccount1";
 	const DEVSTORE_KEY           = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
-	
+
 	/**
 	 * HTTP header prefixes
 	 */
 	const PREFIX_PROPERTIES      = "x-ms-prop-";
 	const PREFIX_METADATA        = "x-ms-meta-";
 	const PREFIX_STORAGE_HEADER  = "x-ms-";
-	
+
 	/**
 	 * Permissions
 	 */
@@ -55,21 +55,21 @@ abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 	 * @var string
 	 */
 	protected $_accountName = '';
-	
+
 	/**
 	 * Account key for Windows Azure
 	 *
 	 * @var string
 	 */
 	protected $_accountKey = '';
-	
+
 	/**
 	 * Use path-style URI's
 	 *
 	 * @var boolean
 	 */
 	protected $_usePathStyleUri = false;
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
 	 *
@@ -86,7 +86,7 @@ public function __construct(
 		$this->_accountKey = base64_decode($accountKey);
 		$this->_usePathStyleUri = $usePathStyleUri;
 	}
-	
+
 	/**
 	 * Set account name for Windows Azure
 	 *
@@ -98,7 +98,7 @@ public function setAccountName($value = Zend_Service_WindowsAzure_Credentials_Cr
 		$this->_accountName = $value;
 		return $this;
 	}
-	
+
 	/**
 	 * Set account key for Windows Azure
 	 *
@@ -110,7 +110,7 @@ public function setAccountkey($value = Zend_Service_WindowsAzure_Credentials_Cre
 		$this->_accountKey = base64_decode($value);
 		return $this;
 	}
-	
+
 	/**
 	 * Set use path-style URI's
 	 *
@@ -122,7 +122,7 @@ public function setUsePathStyleUri($value = false)
 		$this->_usePathStyleUri = $value;
 		return $this;
 	}
-	
+
 	/**
 	 * Sign request URL with credentials
 	 *
@@ -136,7 +136,7 @@ abstract public function signRequestUrl(
 		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
 		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
 	);
-	
+
 	/**
 	 * Sign request headers with credentials
 	 *
@@ -160,11 +160,11 @@ abstract public function signRequestHeaders(
 		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ,
 		$rawData = null
 	);
-	
-	
+
+
 	/**
 	 * Prepare query string for signing
-	 * 
+	 *
 	 * @param  string $value Original query string
 	 * @return string        Query string for signing
 	 */
@@ -172,13 +172,13 @@ protected function _prepareQueryStringForSigning($value)
 	{
 	    // Return value
 	    $returnValue = array();
-	    
+
 	    // Prepare query string
 	    $queryParts = $this->_makeArrayOfQueryString($value);
 	    foreach ($queryParts as $key => $value) {
 	    	$returnValue[] = $key . '=' . $value;
 	    }
-	    
+
 	    // Return
 	    if (count($returnValue) > 0) {
 	    	return '?' . implode('&', $returnValue);
@@ -186,10 +186,10 @@ protected function _prepareQueryStringForSigning($value)
 	    	return '';
 	    }
 	}
-	
+
 	/**
 	 * Make array of query string
-	 * 
+	 *
 	 * @param  string $value Query string
 	 * @return array         Array of key/value pairs
 	 */
@@ -197,32 +197,32 @@ protected function _makeArrayOfQueryString($value)
 	{
 		// Returnvalue
 		$returnValue = array();
-		
-	    // Remove front ?     
+
+	    // Remove front ?
    		if (strlen($value) > 0 && strpos($value, '?') === 0) {
     		$value = substr($value, 1);
     	}
-    		
+
     	// Split parts
     	$queryParts = explode('&', $value);
     	foreach ($queryParts as $queryPart) {
     		$queryPart = explode('=', $queryPart, 2);
-    		
+
     		if ($queryPart[0] != '') {
     			$returnValue[ $queryPart[0] ] = isset($queryPart[1]) ? $queryPart[1] : '';
     		}
     	}
-    	
+
     	// Sort
     	ksort($returnValue);
 
     	// Return
 		return $returnValue;
 	}
-	
+
 	/**
 	 * Returns an array value if the key is set, otherwide returns $valueIfNotSet
-	 * 
+	 *
 	 * @param array $array
 	 * @param mixed $key
 	 * @param mixed $valueIfNotSet
diff --git a/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php b/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
index 5fe8b3050d0..af3c87ad7dc 100644
--- a/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
+++ b/lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
@@ -29,17 +29,17 @@
  * @package    Zend_Service_WindowsAzure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
+ */
 class Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
     extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 {
     /**
      * Permission set
-     * 
+     *
      * @var array
      */
     protected $_permissionSet = array();
-    
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance
 	 *
@@ -56,26 +56,26 @@ public function __construct(
 	    parent::__construct($accountName, $accountKey, $usePathStyleUri);
 	    $this->_permissionSet = $permissionSet;
 	}
-	
+
 	/**
 	 * Get permission set
-	 * 
+	 *
 	 * @return array
 	 */
     public function getPermissionSet()
 	{
-	    return $this->_permissionSet;   
+	    return $this->_permissionSet;
 	}
-	
+
 	/**
 	 * Set permisison set
-	 * 
+	 *
 	 * Warning: fine-grained permissions should be added prior to coarse-grained permissions.
 	 * For example: first add blob permissions, end with container-wide permissions.
-	 * 
+	 *
 	 * Warning: the signed access signature URL must match the account name of the
 	 * Zend_Service_WindowsAzure_Credentials_Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance
-	 * 
+	 *
 	 * @param  array $value Permission set
 	 * @return void
 	 */
@@ -89,17 +89,17 @@ public function setPermissionSet($value = array())
 		}
 	    $this->_permissionSet = $value;
 	}
-    
+
     /**
      * Create signature
-     * 
+     *
      * @param string $path 		   Path for the request
      * @param string $resource     Signed resource - container (c) - blob (b)
      * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
      * @param string $start        The time at which the Shared Access Signature becomes valid.
      * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
      * @param string $identifier   Signed identifier
-     * @return string 
+     * @return string
      */
     public function createSignature(
     	$path = '/',
@@ -113,7 +113,7 @@ public function createSignature(
 		if ($this->_usePathStyleUri) {
 			$path = substr($path, strpos($path, '/'));
 		}
-			
+
 		// Add trailing slash to $path
 		if (substr($path, 0, 1) !== '/') {
 		    $path = '/' . $path;
@@ -125,8 +125,8 @@ public function createSignature(
 			$canonicalizedResource .= '/' . $this->_accountName;
 		}*/
 		$canonicalizedResource .= $path;
-		    
-		// Create string to sign   
+
+		// Create string to sign
 		$stringToSign   = array();
 		$stringToSign[] = $permissions;
     	$stringToSign[] = $start;
@@ -136,13 +136,13 @@ public function createSignature(
 
     	$stringToSign = implode("\n", $stringToSign);
     	$signature    = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-	
+
     	return $signature;
     }
 
     /**
      * Create signed query string
-     * 
+     *
      * @param string $path 		   Path for the request
      * @param string $queryString  Query string for the request
      * @param string $resource     Signed resource - container (c) - blob (b)
@@ -150,7 +150,7 @@ public function createSignature(
      * @param string $start        The time at which the Shared Access Signature becomes valid.
      * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
      * @param string $identifier   Signed identifier
-     * @return string 
+     * @return string
      */
     public function createSignedQueryString(
     	$path = '/',
@@ -182,7 +182,7 @@ public function createSignedQueryString(
 
         return $queryString;
     }
-    
+
     /**
 	 * Permission matches request?
 	 *
@@ -206,34 +206,34 @@ public function permissionMatchesRequest(
 
         // Parse permission url
 	    $parsedPermissionUrl = parse_url($permissionUrl);
-	    
+
 	    // Parse permission properties
 	    $permissionParts = explode('&', $parsedPermissionUrl['query']);
-	    
+
 	    // Parse request url
 	    $parsedRequestUrl = parse_url($requestUrl);
-	    
+
 	    // Check if permission matches request
 	    $matches = true;
 	    foreach ($permissionParts as $part) {
 	        list($property, $value) = explode('=', $part, 2);
-	        
+
 	        if ($property == 'sr') {
 	            $matches = $matches && (strpbrk($value, $requiredResourceType) !== false);
 	        }
-	        
+
 	    	if ($property == 'sp') {
 	            $matches = $matches && (strpbrk($value, $requiredPermission) !== false);
 	        }
 	    }
-	    
+
 	    // Ok, but... does the resource match?
 	    $matches = $matches && (strpos($parsedRequestUrl['path'], $parsedPermissionUrl['path']) !== false);
-	    
+
         // Return
 	    return $matches;
-    }    
-    
+    }
+
     /**
 	 * Sign request URL with credentials
 	 *
@@ -258,18 +258,18 @@ public function signRequestUrl(
 	            } else {
 	                $requestUrl .= '&';
 	            }
-	            
+
 	            $requestUrl .= $parsedPermittedUrl['query'];
 
 	            // Return url
 	            return $requestUrl;
 	        }
 	    }
-	    
+
 	    // Return url, will be unsigned...
 	    return $requestUrl;
 	}
-    
+
 	/**
 	 * Sign request with credentials
 	 *
diff --git a/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php b/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php
index e6511da96f4..3ec2875a248 100644
--- a/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php
+++ b/lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php
@@ -29,7 +29,7 @@
  * @package    Zend_Service_WindowsAzure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
+ */
 class Zend_Service_WindowsAzure_Credentials_SharedKey
     extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 {
@@ -48,7 +48,7 @@ public function signRequestUrl(
 	) {
 	    return $requestUrl;
 	}
-	
+
 	/**
 	 * Sign request headers with credentials
 	 *
@@ -79,7 +79,7 @@ public function signRequestHeaders(
 			#require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php';
 			throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKey authentication on table storage. Use SharedKeyLite authentication instead.');
 		}
-		
+
 		// Determine path
 		if ($this->_usePathStyleUri) {
 			$path = substr($path, strpos($path, '/'));
@@ -87,10 +87,10 @@ public function signRequestHeaders(
 
 		// Determine query
 		$queryString = $this->_prepareQueryStringForSigning($queryString);
-	
+
 		// Canonicalized headers
 		$canonicalizedHeaders = array();
-		
+
 		// Request date
 		$requestDate = '';
 		if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) {
@@ -99,7 +99,7 @@ public function signRequestHeaders(
 		    $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
 		    $canonicalizedHeaders[] = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date:' . $requestDate;
 		}
-		
+
 		// Build canonicalized headers
 		if (!is_null($headers)) {
 			foreach ($headers as $header => $value) {
@@ -127,20 +127,20 @@ public function signRequestHeaders(
 		    	$canonicalizedResource .= "\n" . strtolower($key) . ':' . urldecode($value);
 		    }
 		}
-		
+
 		// Content-Length header
 		$contentLength = '';
 		if (strtoupper($httpVerb) != Zend_Http_Client::GET
 			 && strtoupper($httpVerb) != Zend_Http_Client::DELETE
 			 && strtoupper($httpVerb) != Zend_Http_Client::HEAD) {
 			$contentLength = 0;
-			
+
 			if (!is_null($rawData)) {
 				$contentLength = strlen($rawData);
 			}
 		}
 
-		// Create string to sign   
+		// Create string to sign
 		$stringToSign   = array();
 		$stringToSign[] = strtoupper($httpVerb); 									// VERB
     	$stringToSign[] = $this->_issetOr($headers, 'Content-Encoding', '');		// Content-Encoding
@@ -154,11 +154,11 @@ public function signRequestHeaders(
     	$stringToSign[] = $this->_issetOr($headers, 'If-None-Match', '');			// If-None-Match
     	$stringToSign[] = $this->_issetOr($headers, 'If-Unmodified-Since', '');		// If-Unmodified-Since
     	$stringToSign[] = $this->_issetOr($headers, 'Range', '');					// Range
-    	
+
     	if (!$forTableStorage && count($canonicalizedHeaders) > 0) {
     		$stringToSign[] = implode("\n", $canonicalizedHeaders); // Canonicalized headers
     	}
-    		
+
     	$stringToSign[] = $canonicalizedResource;		 			// Canonicalized resource
     	$stringToSign   = implode("\n", $stringToSign);
     	$signString     = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
@@ -166,7 +166,7 @@ public function signRequestHeaders(
     	// Sign request
     	$headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate;
     	$headers['Authorization'] = 'SharedKey ' . $this->_accountName . ':' . $signString;
-    	
+
     	// Return headers
     	return $headers;
 	}
diff --git a/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php b/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
index 06f1ee74f4c..a7d638cc168 100644
--- a/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
+++ b/lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
@@ -29,7 +29,7 @@
  * @package    Zend_Service_WindowsAzure
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
+ */
 class Zend_Service_WindowsAzure_Credentials_SharedKeyLite
     extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 {
@@ -48,7 +48,7 @@ public function signRequestUrl(
 	) {
 	    return $requestUrl;
 	}
-	
+
 	/**
 	 * Sign request headers with credentials
 	 *
@@ -77,7 +77,7 @@ public function signRequestHeaders(
 			#require_once 'Zend/Service/WindowsAzure/Credentials/Exception.php';
 			throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKeyLite authentication on blob or queue storage. Use SharedKey authentication instead.');
 		}
-		
+
 		// Determine path
 		if ($this->_usePathStyleUri) {
 			$path = substr($path, strpos($path, '/'));
@@ -104,7 +104,7 @@ public function signRequestHeaders(
 		    $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
 		}
 
-		// Create string to sign   
+		// Create string to sign
 		$stringToSign   = array();
     	$stringToSign[] = $requestDate; // Date
     	$stringToSign[] = $canonicalizedResource;		 			// Canonicalized resource
@@ -114,14 +114,14 @@ public function signRequestHeaders(
     	// Sign request
     	$headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate;
     	$headers['Authorization'] = 'SharedKeyLite ' . $this->_accountName . ':' . $signString;
-    	
+
     	// Return headers
     	return $headers;
 	}
-	
+
 	/**
 	 * Prepare query string for signing
-	 * 
+	 *
 	 * @param  string $value Original query string
 	 * @return string        Query string for signing
 	 */
@@ -132,11 +132,11 @@ protected function _prepareQueryStringForSigning($value)
 	        // If not found, no query string needed
 	        return '';
 	    } else {
-	        // If found, make sure it is the only parameter being used      
+	        // If found, make sure it is the only parameter being used
     		if (strlen($value) > 0 && strpos($value, '?') === 0) {
     			$value = substr($value, 1);
     		}
-    		
+
     		// Split parts
     		$queryParts = explode('&', $value);
     		foreach ($queryParts as $queryPart) {
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php
index c57500078cb..d97633a5b66 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php
@@ -64,11 +64,11 @@ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	int	$overallQuotaInMB				Overall quota in MB
 	 */
-    public function __construct($overallQuotaInMB = 0) 
-    {	        
+    public function __construct($overallQuotaInMB = 0)
+    {
         $this->_data = array(
             'overallquotainmb'        		=> $overallQuotaInMB,
             'logs'             				=> new Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs(),
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php
index ddb65663acb..7d6b2de8326 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php
@@ -37,13 +37,13 @@ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationDiagnosticInfrastructur
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	int		$bufferQuotaInMB					Buffer quota in MB
 	 * @param	int		$scheduledTransferPeriodInMinutes	Scheduled transfer period in minutes
 	 * @param	string	$scheduledTransferLogLevelFilter	Scheduled transfer log level filter
 	 */
-    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) 
-    {	        
+    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED)
+    {
         $this->_data = array(
             'bufferquotainmb'        			=> $bufferQuotaInMB,
             'scheduledtransferperiodinminutes' 	=> $scheduledTransferPeriodInMinutes,
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php
index 1c070e71253..39534fadc93 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php
@@ -46,22 +46,22 @@ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	int		$bufferQuotaInMB					Buffer quota in MB
 	 * @param	int		$scheduledTransferPeriodInMinutes	Scheduled transfer period in minutes
 	 */
-    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0) 
-    {	        
+    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0)
+    {
         $this->_data = array(
             'bufferquotainmb'        			=> $bufferQuotaInMB,
             'scheduledtransferperiodinminutes' 	=> $scheduledTransferPeriodInMinutes,
         	'subscriptions'						=> array()
         );
     }
-    
+
 	/**
 	 * Add subscription
-	 * 
+	 *
 	 * @param	string	$path					Path
 	 * @param	string	$container				Container
 	 * @param	int		$directoryQuotaInMB		Directory quota in MB
@@ -70,10 +70,10 @@ public function addSubscription($path, $container, $directoryQuotaInMB = 1024)
     {
     	$this->_data['subscriptions'][$path] = new Zend_Service_WindowsAzure_Diagnostics_DirectoryConfigurationSubscription($path, $container, $directoryQuotaInMB);
     }
-    
+
 	/**
 	 * Remove subscription
-	 * 
+	 *
 	 * @param	string	$path					Path
 	 */
     public function removeSubscription($path)
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php
index 7659b314790..b9c163c38d4 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php
@@ -57,18 +57,18 @@ public function __construct()
 
 	/**
 	 * Load configuration XML
-	 * 
+	 *
 	 * @param string $configurationXml Configuration XML
 	 */
 	public function loadXml($configurationXml)
 	{
 		// Convert to SimpleXMLElement
 		$configurationXml = Zend_Xml_Security::scan($configurationXml);
-	
+
 		// Assign general settings
 		$this->DataSources->OverallQuotaInMB = (int)$configurationXml->DataSources->OverallQuotaInMB;
 
-		// Assign Logs settings	
+		// Assign Logs settings
 		$this->DataSources->Logs->BufferQuotaInMB = (int)$configurationXml->DataSources->Logs->BufferQuotaInMB;
 		$this->DataSources->Logs->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->Logs->ScheduledTransferPeriodInMinutes;
 		$this->DataSources->Logs->ScheduledTransferLogLevelFilter = (string)$configurationXml->DataSources->Logs->ScheduledTransferLogLevelFilter;
@@ -93,7 +93,7 @@ public function loadXml($configurationXml)
 				$this->DataSources->PerformanceCounters->addSubscription((string)$subscription->CounterSpecifier, (int)$subscription->SampleRateInSeconds);
 			}
 		}
-				
+
 		// Assign WindowsEventLog settings
 		$this->DataSources->WindowsEventLog->BufferQuotaInMB = (int)$configurationXml->DataSources->WindowsEventLog->BufferQuotaInMB;
 		$this->DataSources->WindowsEventLog->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->WindowsEventLog->ScheduledTransferPeriodInMinutes;
@@ -110,7 +110,7 @@ public function loadXml($configurationXml)
 				$this->DataSources->WindowsEventLog->addSubscription((string)$subscription);
 			}
 		}
-		
+
 		// Assign Directories settings
 		$this->DataSources->Directories->BufferQuotaInMB = (int)$configurationXml->DataSources->Directories->BufferQuotaInMB;
 		$this->DataSources->Directories->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->Directories->ScheduledTransferPeriodInMinutes;
@@ -128,38 +128,38 @@ public function loadXml($configurationXml)
 			}
 		}
 	}
-	
+
 	/**
 	 * Create configuration XML
-	 * 
+	 *
 	 * @return string
 	 */
 	public function toXml()
 	{
 		// Return value
 		$returnValue = array();
-		
+
 		// Build XML
 		$returnValue[] = '<?xml version="1.0"?>';
 		$returnValue[] = '<ConfigRequest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">';
-		
+
 		// Add data sources
 		$returnValue[] = '  <DataSources>';
-		
+
 		$returnValue[] = '    <OverallQuotaInMB>' . $this->DataSources->OverallQuotaInMB . '</OverallQuotaInMB>';
-		
+
 		$returnValue[] = '    <Logs>';
 		$returnValue[] = '      <BufferQuotaInMB>' . $this->DataSources->Logs->BufferQuotaInMB . '</BufferQuotaInMB>';
 		$returnValue[] = '      <ScheduledTransferPeriodInMinutes>' . $this->DataSources->Logs->ScheduledTransferPeriodInMinutes . '</ScheduledTransferPeriodInMinutes>';
 		$returnValue[] = '      <ScheduledTransferLogLevelFilter>' . $this->DataSources->Logs->ScheduledTransferLogLevelFilter . '</ScheduledTransferLogLevelFilter>';
 		$returnValue[] = '    </Logs>';
-		
+
 		$returnValue[] = '    <DiagnosticInfrastructureLogs>';
 		$returnValue[] = '      <BufferQuotaInMB>' . $this->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB . '</BufferQuotaInMB>';
 		$returnValue[] = '      <ScheduledTransferPeriodInMinutes>' . $this->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes . '</ScheduledTransferPeriodInMinutes>';
 		$returnValue[] = '      <ScheduledTransferLogLevelFilter>' . $this->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferLogLevelFilter . '</ScheduledTransferLogLevelFilter>';
 		$returnValue[] = '    </DiagnosticInfrastructureLogs>';
-		
+
 		$returnValue[] = '    <PerformanceCounters>';
 		$returnValue[] = '      <BufferQuotaInMB>' . $this->DataSources->PerformanceCounters->BufferQuotaInMB . '</BufferQuotaInMB>';
 		$returnValue[] = '      <ScheduledTransferPeriodInMinutes>' . $this->DataSources->PerformanceCounters->ScheduledTransferPeriodInMinutes . '</ScheduledTransferPeriodInMinutes>';
@@ -176,7 +176,7 @@ public function toXml()
 			$returnValue[] = '      </Subscriptions>';
 		}
 		$returnValue[] = '    </PerformanceCounters>';
-		
+
 		$returnValue[] = '    <WindowsEventLog>';
 		$returnValue[] = '      <BufferQuotaInMB>' . $this->DataSources->WindowsEventLog->BufferQuotaInMB . '</BufferQuotaInMB>';
 		$returnValue[] = '      <ScheduledTransferPeriodInMinutes>' . $this->DataSources->WindowsEventLog->ScheduledTransferPeriodInMinutes . '</ScheduledTransferPeriodInMinutes>';
@@ -191,7 +191,7 @@ public function toXml()
 		}
 		$returnValue[] = '      <ScheduledTransferLogLevelFilter>' . $this->DataSources->WindowsEventLog->ScheduledTransferLogLevelFilter . '</ScheduledTransferLogLevelFilter>';
 		$returnValue[] = '    </WindowsEventLog>';
-		
+
 		$returnValue[] = '    <Directories>';
 		$returnValue[] = '      <BufferQuotaInMB>' . $this->DataSources->Directories->BufferQuotaInMB . '</BufferQuotaInMB>';
 		$returnValue[] = '      <ScheduledTransferPeriodInMinutes>' . $this->DataSources->Directories->ScheduledTransferPeriodInMinutes . '</ScheduledTransferPeriodInMinutes>';
@@ -209,11 +209,11 @@ public function toXml()
 			$returnValue[] = '      </Subscriptions>';
 		}
 		$returnValue[] = '    </Directories>';
-		
+
 		$returnValue[] = '  </DataSources>';
 		$returnValue[] = '  <IsDefault>false</IsDefault>';
 		$returnValue[] = '</ConfigRequest>';
-		
+
 		// Return
 		return implode("\r\n", $returnValue);
 	}
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php
index a755a16772a..f6ffd6b8633 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php
@@ -46,13 +46,13 @@ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	int		$bufferQuotaInMB					Buffer quota in MB
 	 * @param	int		$scheduledTransferPeriodInMinutes	Scheduled transfer period in minutes
 	 * @param	string	$scheduledTransferLogLevelFilter	Scheduled transfer log level filter
 	 */
-    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) 
-    {	        
+    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED)
+    {
         $this->_data = array(
             'bufferquotainmb'        			=> $bufferQuotaInMB,
             'scheduledtransferperiodinminutes' 	=> $scheduledTransferPeriodInMinutes,
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php
index dea81c39d70..47ef47f4082 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php
@@ -31,14 +31,14 @@ abstract class Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbst
 {
     /**
      * Data
-     * 
+     *
      * @var array
      */
     protected $_data = null;
-    
+
     /**
      * Magic overload for setting properties
-     * 
+     *
      * @param string $name     Name of the property
      * @param string $value    Value to set
      */
@@ -53,7 +53,7 @@ public function __set($name, $value) {
 
     /**
      * Magic overload for getting properties
-     * 
+     *
      * @param string $name     Name of the property
      */
     public function __get($name) {
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php
index 215402f7dd3..28bb951fe65 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php
@@ -46,34 +46,34 @@ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationPerformanceCounters
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	int		$bufferQuotaInMB					Buffer quota in MB
 	 * @param	int		$scheduledTransferPeriodInMinutes	Scheduled transfer period in minutes
 	 */
-    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0) 
-    {	        
+    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0)
+    {
         $this->_data = array(
             'bufferquotainmb'        			=> $bufferQuotaInMB,
             'scheduledtransferperiodinminutes' 	=> $scheduledTransferPeriodInMinutes,
         	'subscriptions'						=> array()
         );
     }
-    
+
 	/**
 	 * Add subscription
-	 * 
+	 *
  	 * @param	string	$counterSpecifier					Counter specifier
  	 * @param	int		$sampleRateInSeconds				Sample rate in seconds
 	 */
     public function addSubscription($counterSpecifier, $sampleRateInSeconds = 1)
     {
-		
+
     	$this->_data['subscriptions'][$counterSpecifier] = new Zend_Service_WindowsAzure_Diagnostics_PerformanceCounterSubscription($counterSpecifier, $sampleRateInSeconds);
     }
-    
+
 	/**
 	 * Remove subscription
-	 * 
+	 *
  	 * @param	string	$counterSpecifier					Counter specifier
 	 */
     public function removeSubscription($counterSpecifier)
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php
index f8a069496eb..3b991430a51 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php
@@ -37,13 +37,13 @@ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationWindowsEventLog
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	int		$bufferQuotaInMB					Buffer quota in MB
 	 * @param	int		$scheduledTransferPeriodInMinutes	Scheduled transfer period in minutes
 	 * @param	string	$scheduledTransferLogLevelFilter	Scheduled transfer log level filter
 	 */
-    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) 
-    {	        
+    public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED)
+    {
         $this->_data = array(
             'bufferquotainmb'        			=> $bufferQuotaInMB,
             'scheduledtransferperiodinminutes' 	=> $scheduledTransferPeriodInMinutes,
@@ -51,20 +51,20 @@ public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinu
         	'subscriptions'						=> array()
         );
     }
-    
+
 	/**
 	 * Add subscription
-	 * 
+	 *
  	 * @param	string	$filter	Event log filter
 	 */
     public function addSubscription($filter)
     {
     	$this->_data['subscriptions'][$filter] = $filter;
     }
-    
+
 	/**
 	 * Remove subscription
-	 * 
+	 *
  	 * @param	string	$filter	Event log filter
 	 */
     public function removeSubscription($filter)
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php b/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php
index 1f62028d79a..eb1e23e1d08 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php
@@ -37,13 +37,13 @@ class Zend_Service_WindowsAzure_Diagnostics_DirectoryConfigurationSubscription
 {
     /**
      * Constructor
-     * 
+     *
 	 * @param	string	$path					Path
 	 * @param	string	$container				Container
 	 * @param	int		$directoryQuotaInMB		Directory quota in MB
 	 */
-    public function __construct($path, $container, $directoryQuotaInMB = 1024) 
-    {	        
+    public function __construct($path, $container, $directoryQuotaInMB = 1024)
+    {
         $this->_data = array(
             'path'      			=> $path,
             'container' 			=> $container,
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php b/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php
index c8f8b0dfb0f..a0e11db9c9b 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php
@@ -36,21 +36,21 @@ class Zend_Service_WindowsAzure_Diagnostics_Manager
 {
 	/**
 	 * Blob storage client
-	 * 
+	 *
 	 * @var Zend_Service_WindowsAzure_Storage_Blob
 	 */
 	protected $_blobStorageClient = null;
-	
+
 	/**
 	 * Control container name
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_controlContainer = '';
 
 	/**
 	 * Create a new instance of Zend_Service_WindowsAzure_Diagnostics_Manager
-	 * 
+	 *
 	 * @param Zend_Service_WindowsAzure_Storage_Blob $blobStorageClient Blob storage client
 	 * @param string $controlContainer Control container name
 	 */
@@ -71,20 +71,20 @@ protected function _ensureStorageInitialized()
 			$this->_blobStorageClient->createContainer($this->_controlContainer);
 		}
 	}
-	
+
 	/**
 	 * Get default configuration values
-	 * 
+	 *
 	 * @return Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance
 	 */
 	public function getDefaultConfiguration()
 	{
 		return new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance();
 	}
-	
+
 	/**
 	 * Checks if a configuration for a specific role instance exists.
-	 * 
+	 *
 	 * @param string $roleInstance Role instance name, can be found in $_SERVER['RdRoleId'] when hosted on Windows Azure.
 	 * @return boolean
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
@@ -98,10 +98,10 @@ public function configurationForRoleInstanceExists($roleInstance = null)
 
 		return $this->_blobStorageClient->blobExists($this->_controlContainer, $roleInstance);
 	}
-	
+
 	/**
 	 * Checks if a configuration for current role instance exists. Only works on Development Fabric or Windows Azure Fabric.
-	 * 
+	 *
 	 * @return boolean
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
 	 */
@@ -114,10 +114,10 @@ public function configurationForCurrentRoleInstanceExists()
 
 		return $this->_blobStorageClient->blobExists($this->_controlContainer, $this->_getCurrentRoleInstanceId());
 	}
-	
+
 	/**
 	 * Get configuration for current role instance. Only works on Development Fabric or Windows Azure Fabric.
-	 * 
+	 *
 	 * @return Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
 	 */
@@ -129,10 +129,10 @@ public function getConfigurationForCurrentRoleInstance()
 		}
 		return $this->getConfigurationForRoleInstance($this->_getCurrentRoleInstanceId());
 	}
-	
+
 	/**
 	 * Get the current role instance ID. Only works on Development Fabric or Windows Azure Fabric.
-	 * 
+	 *
 	 * @return string
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
 	 */
@@ -142,7 +142,7 @@ protected function _getCurrentRoleInstanceId()
 			#require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php';
 			throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Server variable \'RdRoleId\' is unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.');
 		}
-		
+
 		if (strpos($_SERVER['RdRoleId'], 'deployment(') === false) {
 			return $_SERVER['RdRoleId'];
 		} else {
@@ -153,17 +153,17 @@ protected function _getCurrentRoleInstanceId()
 		if (!isset($_SERVER['RoleDeploymentID']) && !isset($_SERVER['RoleInstanceID']) && !isset($_SERVER['RoleName'])) {
 			throw new Exception('Server variables \'RoleDeploymentID\', \'RoleInstanceID\' and \'RoleName\' are unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.');
 		}
-		
+
 		if (strpos($_SERVER['RdRoleId'], 'deployment(') === false) {
 			return $_SERVER['RdRoleId'];
 		} else {
 			return $_SERVER['RoleDeploymentID'] . '/' . $_SERVER['RoleInstanceID'] . '/' . $_SERVER['RoleName'];
 		}
 	}
-	
+
 	/**
 	 * Set configuration for current role instance. Only works on Development Fabric or Windows Azure Fabric.
-	 * 
+	 *
 	 * @param Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration Configuration to apply
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
 	 */
@@ -173,13 +173,13 @@ public function setConfigurationForCurrentRoleInstance(Zend_Service_WindowsAzure
 			#require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php';
 			throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Server variable \'RdRoleId\' is unknown. Please verify the application is running in Development Fabric or Windows Azure Fabric.');
 		}
-		
+
 		$this->setConfigurationForRoleInstance($this->_getCurrentRoleInstanceId(), $configuration);
 	}
-	
+
 	/**
 	 * Get configuration for a specific role instance
-	 * 
+	 *
 	 * @param string $roleInstance Role instance name, can be found in $_SERVER['RdRoleId'] when hosted on Windows Azure.
 	 * @return Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
@@ -191,8 +191,8 @@ public function getConfigurationForRoleInstance($roleInstance = null)
 			throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Role instance should be specified. Try reading $_SERVER[\'RdRoleId\'] for this information if the application is hosted on Windows Azure Fabric or Development Fabric.');
 		}
 
-		
-		
+
+
 		if ($this->_blobStorageClient->blobExists($this->_controlContainer, $roleInstance)) {
 			$configurationInstance = new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance();
 			$configurationInstance->loadXml( $this->_blobStorageClient->getBlobData($this->_controlContainer, $roleInstance) );
@@ -201,10 +201,10 @@ public function getConfigurationForRoleInstance($roleInstance = null)
 
 		return new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance();
 	}
-	
+
 	/**
 	 * Set configuration for a specific role instance
-	 * 
+	 *
 	 * @param string $roleInstance Role instance name, can be found in $_SERVER['RdRoleId'] when hosted on Windows Azure.
 	 * @param Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration Configuration to apply
 	 * @throws Zend_Service_WindowsAzure_Diagnostics_Exception
diff --git a/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php b/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php
index cf6db00087d..2905d077339 100644
--- a/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php
+++ b/lib/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php
@@ -40,12 +40,12 @@ class Zend_Service_WindowsAzure_Diagnostics_PerformanceCounterSubscription
 {
     /**
      * Constructor
-     * 
+     *
  	 * @param	string	$counterSpecifier					Counter specifier
  	 * @param	int		$sampleRateInSeconds				Sample rate in seconds
 	 */
-    public function __construct($counterSpecifier, $sampleRateInSeconds = 1) 
-    {	        
+    public function __construct($counterSpecifier, $sampleRateInSeconds = 1)
+    {
         $this->_data = array(
             'counterspecifier'      => $counterSpecifier,
             'samplerateinseconds' 	=> $sampleRateInSeconds
diff --git a/lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php b/lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php
index f1382e61780..c41175442b8 100644
--- a/lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/AffinityGroupInstance.php
@@ -31,8 +31,8 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Name              The affinity group name. 
+ *
+ * @property string $Name              The affinity group name.
  * @property string $Label             A label for the affinity group.
  * @property string $Description       A description for the affinity group.
  * @property string $Location          The location of the affinity group.
@@ -41,19 +41,19 @@
  */
 class Zend_Service_WindowsAzure_Management_AffinityGroupInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
-     * @property string $name              The affinity group name. 
+     *
+     * @property string $name              The affinity group name.
      * @property string $label             A label for the affinity group.
      * @property string $description       A description for the affinity group.
      * @property string $location          The location of the affinity group.
      * @property array  $hostedServices    A list of hosted services in this affinity gtoup.
      * @property array  $storageServices   A list of storage services in this affinity gtoup.
 	 */
-    public function __construct($name, $label, $description, $location, $hostedServices = array(), $storageServices = array()) 
-    {	        
+    public function __construct($name, $label, $description, $location, $hostedServices = array(), $storageServices = array())
+    {
         $this->_data = array(
             'name'              => $name,
             'label'             => base64_decode($label),
diff --git a/lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php b/lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php
index 97db3e1c39a..359601ada73 100644
--- a/lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/CertificateInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $CertificateUrl          Certificate thumbprint address.
  * @property string $Thumbprint              Certificate thumbprint.
  * @property string $ThumbprintAlgorithm	 Certificate thumbprint algorithm.
@@ -39,22 +39,22 @@
  */
 class Zend_Service_WindowsAzure_Management_CertificateInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $certificateUrl          Certificate thumbprint address.
      * @param string $thumbprint              Certificate thumbprint.
      * @param string $thumbprintAlgorithm	 Certificate thumbprint algorithm.
      * @param string $data                    Certificate data.
 	 */
-    public function __construct($certificateUrl, $thumbprint, $thumbprintAlgorithm, $data) 
-    {	        
+    public function __construct($certificateUrl, $thumbprint, $thumbprintAlgorithm, $data)
+    {
         $this->_data = array(
             'certificateurl'       => $certificateUrl,
             'thumbprint'           => $thumbprint,
             'thumbprintalgorithm'  => $thumbprintAlgorithm,
-            'data'                 => base64_decode($data)        
+            'data'                 => base64_decode($data)
         );
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/Client.php b/lib/Zend/Service/WindowsAzure/Management/Client.php
index 3ac1da04b8e..e714cfb5cb5 100644
--- a/lib/Zend/Service/WindowsAzure/Management/Client.php
+++ b/lib/Zend/Service/WindowsAzure/Management/Client.php
@@ -91,7 +91,7 @@ class Zend_Service_WindowsAzure_Management_Client
 	 * Management service URL
 	 */
 	const URL_MANAGEMENT        = "https://management.core.windows.net";
-	
+
 	/**
 	 * Operations
 	 */
@@ -105,56 +105,56 @@ class Zend_Service_WindowsAzure_Management_Client
 
 	/**
 	 * Current API version
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_apiVersion = '2011-02-25';
-	
+
 	/**
 	 * Subscription ID
 	 *
 	 * @var string
 	 */
 	protected $_subscriptionId = '';
-	
+
 	/**
 	 * Management certificate path (.PEM)
 	 *
 	 * @var string
 	 */
 	protected $_certificatePath = '';
-	
+
 	/**
 	 * Management certificate passphrase
 	 *
 	 * @var string
 	 */
 	protected $_certificatePassphrase = '';
-	
+
 	/**
 	 * Zend_Http_Client channel used for communication with REST services
-	 * 
+	 *
 	 * @var Zend_Http_Client
 	 */
-	protected $_httpClientChannel = null;	
+	protected $_httpClientChannel = null;
 
 	/**
 	 * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance
-	 * 
+	 *
 	 * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
 	 */
 	protected $_retryPolicy = null;
-	
+
 	/**
 	 * Returns the last request ID
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_lastRequestId = null;
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Management instance
-	 * 
+	 *
 	 * @param string $subscriptionId Subscription ID
 	 * @param string $certificatePath Management certificate path (.PEM)
 	 * @param string $certificatePassphrase Management certificate passphrase
@@ -169,12 +169,12 @@ public function __construct(
 		$this->_subscriptionId = $subscriptionId;
 		$this->_certificatePath = $certificatePath;
 		$this->_certificatePassphrase = $certificatePassphrase;
-		
+
 		$this->_retryPolicy = $retryPolicy;
 		if (is_null($this->_retryPolicy)) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
-		
+
 		// Setup default Zend_Http_Client channel
 		$options = array(
 		    'adapter'       => 'Zend_Http_Client_Adapter_Socket',
@@ -192,47 +192,47 @@ public function __construct(
 		}
 		$this->_httpClientChannel = new Zend_Http_Client(null, $options);
 	}
-	
+
 	/**
 	 * Set the HTTP client channel to use
-	 * 
+	 *
 	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
 	 */
 	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Socket')
 	{
 		$this->_httpClientChannel->setAdapter($adapterInstance);
 	}
-	
+
     /**
      * Retrieve HTTP client channel
-     * 
+     *
      * @return Zend_Http_Client_Adapter_Interface
      */
     public function getHttpClientChannel()
     {
         return $this->_httpClientChannel;
     }
-	
+
 	/**
 	 * Returns the Windows Azure subscription ID
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getSubscriptionId()
 	{
 		return $this->_subscriptionId;
 	}
-	
+
 	/**
 	 * Returns the last request ID.
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getLastRequestId()
 	{
 		return $this->_lastRequestId;
 	}
-	
+
 	/**
 	 * Get base URL for creating requests
 	 *
@@ -242,7 +242,7 @@ public function getBaseUrl()
 	{
 		return self::URL_MANAGEMENT . '/' . $this->_subscriptionId;
 	}
-	
+
 	/**
 	 * Perform request using Zend_Http_Client channel
 	 *
@@ -264,12 +264,12 @@ protected function _performRequest(
 		if (strpos($path, '/') !== 0) {
 			$path = '/' . $path;
 		}
-			
+
 		// Clean headers
 		if (is_null($headers)) {
 		    $headers = array();
 		}
-		
+
 		// Ensure cUrl will also work correctly:
 		//  - disable Content-Type if required
 		//  - disable Expect: 100 Continue
@@ -280,7 +280,7 @@ protected function _performRequest(
 
 		// Add version header
 		$headers['x-ms-version'] = $this->_apiVersion;
-		    
+
 		// URL encoding
 		$path           = self::urlencode($path);
 		$queryString    = self::urlencode($queryString);
@@ -289,7 +289,7 @@ protected function _performRequest(
 		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
 		$requestHeaders = $headers;
 
-		// Prepare request 
+		// Prepare request
 		$this->_httpClientChannel->resetParameters(true);
 		$this->_httpClientChannel->setUri($requestUrl);
 		$this->_httpClientChannel->setHeaders($requestHeaders);
@@ -300,14 +300,14 @@ protected function _performRequest(
 		    array($this->_httpClientChannel, 'request'),
 		    array($httpVerb)
 		);
-		
+
 		// Store request id
 		$this->_lastRequestId = $response->getHeader('x-ms-request-id');
-		
+
 		return $response;
 	}
-	
-	/** 
+
+	/**
 	 * Parse result from Zend_Http_Response
 	 *
 	 * @param Zend_Http_Response $response Response from HTTP call
@@ -320,27 +320,27 @@ protected function _parseResponse(Zend_Http_Response $response = null)
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
 		}
-		
+
         $xml = Zend_Xml_Security::scan($response->getBody());
-        
+
         if ($xml !== false) {
-            // Fetch all namespaces 
-            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); 
-            
+            // Fetch all namespaces
+            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true));
+
             // Register all namespace prefixes
-            foreach ($namespaces as $prefix => $ns) { 
+            foreach ($namespaces as $prefix => $ns) {
                 if ($prefix != '') {
                     $xml->registerXPathNamespace($prefix, $ns);
-                } 
-            } 
+                }
+            }
         }
-        
+
         return $xml;
 	}
-	
+
 	/**
 	 * URL encode function
-	 * 
+	 *
 	 * @param  string $value Value to encode
 	 * @return string        Encoded value
 	 */
@@ -348,10 +348,10 @@ public static function urlencode($value)
 	{
 	    return str_replace(' ', '%20', $value);
 	}
-	
+
     /**
      * Builds a query string from an array of elements
-     * 
+     *
      * @param array     Array of elements
      * @return string   Assembled query string
      */
@@ -359,7 +359,7 @@ public static function createQueryStringFromArray($queryString)
     {
     	return count($queryString) > 0 ? '?' . implode('&', $queryString) : '';
     }
-    
+
 	/**
 	 * Get error message from Zend_Http_Response
 	 *
@@ -376,7 +376,7 @@ protected function _getErrorMessage(Zend_Http_Response $response, $alternativeEr
 			return $alternativeError;
 		}
 	}
-    
+
     /**
      * The Get Operation Status operation returns the status of the specified operation.
      * After calling an asynchronous operation, you can call Get Operation Status to
@@ -391,7 +391,7 @@ public function getOperationStatus($requestId = '')
     	if ($requestId == '') {
     		$requestId = $this->getLastRequestId();
     	}
-    	
+
     	$response = $this->_performRequest(self::OP_OPERATIONS . '/' . $requestId);
 
     	if ($response->isSuccessful()) {
@@ -411,17 +411,17 @@ public function getOperationStatus($requestId = '')
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
 
-    
+
+
     /**
      * The List Subscription Operations operation returns a list of create, update,
      * and delete operations that were performed on a subscription during the specified timeframe.
      * Documentation on the parameters can be found at http://msdn.microsoft.com/en-us/library/gg715318.aspx.
      *
      * @param string $startTime The start of the timeframe to begin listing subscription operations in UTC format. This parameter and the $endTime parameter indicate the timeframe to retrieve subscription operations. This parameter cannot indicate a start date of more than 90 days in the past.
-     * @param string $endTime The end of the timeframe to begin listing subscription operations in UTC format. This parameter and the $startTime parameter indicate the timeframe to retrieve subscription operations. 
-     * @param string $objectIdFilter Returns subscription operations only for the specified object type and object ID. 
+     * @param string $endTime The end of the timeframe to begin listing subscription operations in UTC format. This parameter and the $startTime parameter indicate the timeframe to retrieve subscription operations.
+     * @param string $objectIdFilter Returns subscription operations only for the specified object type and object ID.
      * @param string $operationResultFilter Returns subscription operations only for the specified result status, either Succeeded, Failed, or InProgress.
      * @param string $continuationToken Internal usage.
      * @return array Array of Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance
@@ -444,7 +444,7 @@ public function listSubscriptionOperations($startTime, $endTime, $objectIdFilter
 	    		throw new Zend_Service_WindowsAzure_Management_Exception('OperationResultFilter should be succeeded|failed|inprogress.');
 	    	}
     	}
-    	
+
     	$parameters = array();
     	$parameters[] = 'StartTime=' . $startTime;
     	$parameters[] = 'EndTime=' . $endTime;
@@ -457,18 +457,18 @@ public function listSubscriptionOperations($startTime, $endTime, $objectIdFilter
     	if ($continuationToken != '' && !is_null($continuationToken)) {
     		$parameters[] = 'ContinuationToken=' . $continuationToken;
     	}
-    	
+
     	$response = $this->_performRequest(self::OP_OPERATIONS, '?' . implode('&', $parameters));
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			$namespaces = $result->getDocNamespaces(); 
+			$namespaces = $result->getDocNamespaces();
     		$result->registerXPathNamespace('__empty_ns', $namespaces['']);
- 
+
 			$xmlOperations = $result->xpath('//__empty_ns:SubscriptionOperation');
-			
+
 		    // Create return value
-		    $returnValue = array();		    
+		    $returnValue = array();
 		    foreach ($xmlOperations as $xmlOperation) {
 		    	// Create operation instance
 		    	$operation = new Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance(
@@ -479,24 +479,24 @@ public function listSubscriptionOperations($startTime, $endTime, $objectIdFilter
 		    		(array)$xmlOperation->OperationCaller,
 		    		(array)$xmlOperation->OperationStatus
 		    	);
-		    	
+
 		    	// Parse parameters
-		    	$xmlOperation->registerXPathNamespace('__empty_ns', $namespaces['']); 
+		    	$xmlOperation->registerXPathNamespace('__empty_ns', $namespaces['']);
 		    	$xmlParameters = $xmlOperation->xpath('.//__empty_ns:OperationParameter');
 		    	foreach ($xmlParameters as $xmlParameter) {
 		    		$xmlParameterDetails = $xmlParameter->children('http://schemas.datacontract.org/2004/07/Microsoft.Samples.WindowsAzure.ServiceManagement');
 		    		$operation->addOperationParameter((string)$xmlParameterDetails->Name, (string)$xmlParameterDetails->Value);
 		    	}
-		    	
+
     		    // Add to result
     		    $returnValue[] = $operation;
 		    }
-		    
+
 			// More data?
 		    if (!is_null($result->ContinuationToken) && $result->ContinuationToken != '') {
 		    	$returnValue = array_merge($returnValue, $this->listSubscriptionOperations($startTime, $endTime, $objectIdFilter, $operationResultFilter, (string)$result->ContinuationToken));
 		    }
-		    
+
 		    // Return
 		    return $returnValue;
 		} else {
@@ -504,10 +504,10 @@ public function listSubscriptionOperations($startTime, $endTime, $objectIdFilter
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * Wait for an operation to complete
-     * 
+     *
      * @param string $requestId The request ID. If omitted, the last request ID will be used.
      * @param int $sleepInterval Sleep interval in milliseconds.
      * @return Zend_Service_WindowsAzure_Management_OperationStatusInstance
@@ -527,10 +527,10 @@ public function waitForOperation($requestId = '', $sleepInterval = 250)
 		  $status = $this->getOperationStatus($requestId);
 		  usleep($sleepInterval);
 		}
-		
+
 		return $status;
     }
-    
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Storage_Blob instance for the current account
 	 *
@@ -543,11 +543,11 @@ public function createBlobClientForService($serviceName, Zend_Service_WindowsAzu
 		if ($serviceName == '' || is_null($serviceName)) {
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$storageKeys = $this->getStorageAccountKeys($serviceName);
-    	
-		
-		
+
+
+
 		return new Zend_Service_WindowsAzure_Storage_Blob(
 			Zend_Service_WindowsAzure_Storage::URL_CLOUD_BLOB,
 			$serviceName,
@@ -556,7 +556,7 @@ public function createBlobClientForService($serviceName, Zend_Service_WindowsAzu
 			$retryPolicy
 		);
 	}
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Storage_Table instance for the current account
 	 *
@@ -570,9 +570,9 @@ public function createTableClientForService($serviceName, Zend_Service_WindowsAz
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$storageKeys = $this->getStorageAccountKeys($serviceName);
-		
+
 		return new Zend_Service_WindowsAzure_Storage_Table(
 			Zend_Service_WindowsAzure_Storage::URL_CLOUD_TABLE,
 			$serviceName,
@@ -581,7 +581,7 @@ public function createTableClientForService($serviceName, Zend_Service_WindowsAz
 			$retryPolicy
 		);
 	}
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Storage_Queue instance for the current account
 	 *
@@ -595,11 +595,11 @@ public function createQueueClientForService($serviceName, Zend_Service_WindowsAz
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$storageKeys = $this->getStorageAccountKeys($serviceName);
-    	
+
 		#require_once 'Zend/Service/WindowsAzure/Storage/Queue.php';
-		
+
 		return new Zend_Service_WindowsAzure_Storage_Queue(
 			Zend_Service_WindowsAzure_Storage::URL_CLOUD_QUEUE,
 			$serviceName,
@@ -608,7 +608,7 @@ public function createQueueClientForService($serviceName, Zend_Service_WindowsAz
 			$retryPolicy
 		);
 	}
-    
+
     /**
      * The List Storage Accounts operation lists the storage accounts available under
      * the current subscription.
@@ -621,7 +621,7 @@ public function listStorageAccounts()
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
     		if (!$result->StorageService) {
 				return array();
 			}
@@ -630,9 +630,9 @@ public function listStorageAccounts()
     		} else {
     		    $xmlServices = array($result->StorageService);
     		}
-    		
+
 			$services = array();
-			if (!is_null($xmlServices)) {				
+			if (!is_null($xmlServices)) {
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_StorageServiceInstance(
 					    (string)$xmlServices[$i]->Url,
@@ -645,10 +645,10 @@ public function listStorageAccounts()
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Get Storage Account Properties operation returns the system properties for the
-     * specified storage account. These properties include: the address, description, and 
+     * specified storage account. These properties include: the address, description, and
      * label of the storage account; and the name of the affinity group to which the service
      * belongs, or its geo-location if it is not part of an affinity group.
      *
@@ -661,7 +661,7 @@ public function getStorageAccountProperties($serviceName)
     	if ($serviceName == '' || is_null($serviceName)) {
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$response = $this->_performRequest(self::OP_STORAGE_ACCOUNTS . '/' . $serviceName);
 
     	if ($response->isSuccessful()) {
@@ -669,7 +669,7 @@ public function getStorageAccountProperties($serviceName)
 
 			if (!is_null($xmlService)) {
 				#require_once 'Zend/Service/WindowsAzure/Management/StorageServiceInstance.php';
-				
+
 				return new Zend_Service_WindowsAzure_Management_StorageServiceInstance(
 					(string)$xmlService->Url,
 					(string)$xmlService->ServiceName,
@@ -685,7 +685,7 @@ public function getStorageAccountProperties($serviceName)
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Get Storage Keys operation returns the primary
      * and secondary access keys for the specified storage account.
@@ -700,7 +700,7 @@ public function getStorageAccountKeys($serviceName)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$response = $this->_performRequest(self::OP_STORAGE_ACCOUNTS . '/' . $serviceName . '/keys');
 
     	if ($response->isSuccessful()) {
@@ -718,7 +718,7 @@ public function getStorageAccountKeys($serviceName)
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Regenerate Keys operation regenerates the primary
      * or secondary access key for the specified storage account.
@@ -739,7 +739,7 @@ public function regenerateStorageAccountKey($serviceName, $key = 'primary')
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Key identifier should be primary|secondary.');
     	}
-    	
+
     	$response = $this->_performRequest(
     		self::OP_STORAGE_ACCOUNTS . '/' . $serviceName . '/keys', '?action=regenerate',
     		Zend_Http_Client::POST,
@@ -764,7 +764,7 @@ public function regenerateStorageAccountKey($serviceName, $key = 'primary')
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The List Hosted Services operation lists the hosted services available
      * under the current subscription.
@@ -778,7 +778,7 @@ public function listHostedServices()
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
     		if (!$result->HostedService) {
 				return array();
 			}
@@ -787,10 +787,10 @@ public function listHostedServices()
     		} else {
     		    $xmlServices = array($result->HostedService);
     		}
-    		
+
 			$services = array();
-			if (!is_null($xmlServices)) {	
-				
+			if (!is_null($xmlServices)) {
+
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_HostedServiceInstance(
 					    (string)$xmlServices[$i]->Url,
@@ -804,14 +804,14 @@ public function listHostedServices()
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Create Hosted Service operation creates a new hosted service in Windows Azure.
-     * 
+     *
      * @param string $serviceName A name for the hosted service that is unique to the subscription.
      * @param string $label A label for the hosted service. The label may be up to 100 characters in length.
      * @param string $description A description for the hosted service. The description may be up to 1024 characters in length.
-     * @param string $location Required if AffinityGroup is not specified. The location where the hosted service will be created. 
+     * @param string $location Required if AffinityGroup is not specified. The location where the hosted service will be created.
      * @param string $affinityGroup Required if Location is not specified. The name of an existing affinity group associated with this subscription.
      */
     public function createHostedService($serviceName, $label, $description = '', $location = null, $affinityGroup = null)
@@ -836,25 +836,25 @@ public function createHostedService($serviceName, $label, $description = '', $lo
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Please specify a location -or- an affinity group for the service.');
     	}
-    	
+
     	$locationOrAffinityGroup = is_null($location)
     		? '<AffinityGroup>' . $affinityGroup . '</AffinityGroup>'
     		: '<Location>' . $location . '</Location>';
-    	
+
         $response = $this->_performRequest(self::OP_HOSTED_SERVICES, '',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<CreateHostedService xmlns="http://schemas.microsoft.com/windowsazure"><ServiceName>' . $serviceName . '</ServiceName><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description>' . $locationOrAffinityGroup . '</CreateHostedService>');
- 	
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Update Hosted Service operation updates the label and/or the description for a hosted service in Windows Azure.
-     * 
+     *
      * @param string $serviceName A name for the hosted service that is unique to the subscription.
      * @param string $label A label for the hosted service. The label may be up to 100 characters in length.
      * @param string $description A description for the hosted service. The description may be up to 1024 characters in length.
@@ -873,21 +873,21 @@ public function updateHostedService($serviceName, $label, $description = '')
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Label is too long. The maximum length is 100 characters.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_HOSTED_SERVICES . '/' . $serviceName, '',
     		Zend_Http_Client::PUT,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<UpdateHostedService xmlns="http://schemas.microsoft.com/windowsazure"><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description></UpdateHostedService>');
- 	
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Delete Hosted Service operation deletes the specified hosted service in Windows Azure.
-     * 
+     *
      * @param string $serviceName A name for the hosted service that is unique to the subscription.
      */
     public function deleteHostedService($serviceName)
@@ -896,15 +896,15 @@ public function deleteHostedService($serviceName)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_HOSTED_SERVICES . '/' . $serviceName, '', Zend_Http_Client::DELETE);
- 	
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Get Hosted Service Properties operation retrieves system properties
      * for the specified hosted service. These properties include the service
@@ -922,14 +922,14 @@ public function getHostedServiceProperties($serviceName)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$response = $this->_performRequest(self::OP_HOSTED_SERVICES . '/' . $serviceName, '?embed-detail=true');
 
     	if ($response->isSuccessful()) {
 			$xmlService = $this->_parseResponse($response);
 
 			if (!is_null($xmlService)) {
-				
+
 				$returnValue = new Zend_Service_WindowsAzure_Management_HostedServiceInstance(
 					(string)$xmlService->Url,
 					(string)$xmlService->ServiceName,
@@ -938,20 +938,20 @@ public function getHostedServiceProperties($serviceName)
 					(string)$xmlService->HostedServiceProperties->Location,
 					(string)$xmlService->HostedServiceProperties->Label
 				);
-				
+
 				// Deployments
 		    	if (count($xmlService->Deployments->Deployment) > 1) {
     		    	$xmlServices = $xmlService->Deployments->Deployment;
     			} else {
     		    	$xmlServices = array($xmlService->Deployments->Deployment);
     			}
-    			
+
     			$deployments = array();
     			foreach ($xmlServices as $xmlDeployment) {
 					$deployments[] = $this->_convertXmlElementToDeploymentInstance($xmlDeployment);
     			}
 				$returnValue->Deployments = $deployments;
-				
+
 				return $returnValue;
 			}
 			return null;
@@ -964,7 +964,7 @@ public function getHostedServiceProperties($serviceName)
     /**
      * The Create Deployment operation uploads a new service package
      * and creates a new deployment on staging or production.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
 	 * @param string $name              The name for the deployment. The deployment ID as listed on the Windows Azure management portal must be unique among other deployments for the hosted service.
@@ -1006,30 +1006,30 @@ public function createDeployment($serviceName, $deploymentSlot, $name, $label, $
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Configuration should be specified.');
     	}
-    	
+
     	if (@file_exists($configuration)) {
     		$configuration = utf8_decode(file_get_contents($configuration));
     	}
-    	
+
     	// Clean up the configuration
     	$conformingConfiguration = $this->_cleanConfiguration($configuration);
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
         $response = $this->_performRequest($operationUrl, '',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<CreateDeployment xmlns="http://schemas.microsoft.com/windowsazure"><Name>' . $name . '</Name><PackageUrl>' . $packageUrl . '</PackageUrl><Label>' . base64_encode($label) . '</Label><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration><StartDeployment>' . ($startDeployment ? 'true' : 'false') . '</StartDeployment><TreatWarningsAsError>' . ($treatWarningsAsErrors ? 'true' : 'false') . '</TreatWarningsAsError></CreateDeployment>');
- 	
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}    	
+		}
     }
-    
+
     /**
      * The Get Deployment operation returns configuration information, status,
      * and system properties for the specified deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @return Zend_Service_WindowsAzure_Management_DeploymentInstance
@@ -1046,15 +1046,15 @@ public function getDeploymentBySlot($serviceName, $deploymentSlot)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
     	return $this->_getDeployment($operationUrl);
     }
-    
+
     /**
      * The Get Deployment operation returns configuration information, status,
      * and system properties for the specified deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
      * @return Zend_Service_WindowsAzure_Management_DeploymentInstance
@@ -1070,15 +1070,15 @@ public function getDeploymentByDeploymentId($serviceName, $deploymentId)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId;
     	return $this->_getDeployment($operationUrl);
     }
-    
+
     /**
      * The Get Deployment operation returns configuration information, status,
      * and system properties for the specified deployment.
-     * 
+     *
      * @param string $operationUrl		The operation url
      * @return Zend_Service_WindowsAzure_Management_DeploymentInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1089,21 +1089,21 @@ protected function _getDeployment($operationUrl)
 
     	if ($response->isSuccessful()) {
 			$xmlService = $this->_parseResponse($response);
-			
+
 			return $this->_convertXmlElementToDeploymentInstance($xmlService);
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Swap Deployment operation initiates a virtual IP swap between
      * the staging and production deployment environments for a service.
      * If the service is currently running in the staging environment,
      * it will be swapped to the production environment. If it is running
      * in the production environment, it will be swapped to staging.
-     * 
+     *
      * @param string $serviceName The service name.
      * @param string $productionDeploymentName The name of the production deployment.
      * @param string $sourceDeploymentName The name of the source deployment.
@@ -1123,22 +1123,22 @@ public function swapDeployment($serviceName, $productionDeploymentName, $sourceD
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Source Deployment ID should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName;
         $response = $this->_performRequest($operationUrl, '',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<Swap xmlns="http://schemas.microsoft.com/windowsazure"><Production>' . $productionDeploymentName . '</Production><SourceDeployment>' . $sourceDeploymentName . '</SourceDeployment></Swap>');
-    		
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}    	
+		}
     }
-    
+
     /**
      * The Delete Deployment operation deletes the specified deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1154,14 +1154,14 @@ public function deleteDeploymentBySlot($serviceName, $deploymentSlot)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
     	return $this->_deleteDeployment($operationUrl);
     }
-    
+
     /**
      * The Delete Deployment operation deletes the specified deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1176,30 +1176,30 @@ public function deleteDeploymentByDeploymentId($serviceName, $deploymentId)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId;
     	return $this->_deleteDeployment($operationUrl);
     }
-    
+
     /**
      * The Delete Deployment operation deletes the specified deployment.
-     * 
+     *
      * @param string $operationUrl		The operation url
      * @throws Zend_Service_WindowsAzure_Management_Exception
      */
     protected function _deleteDeployment($operationUrl)
     {
         $response = $this->_performRequest($operationUrl, '', Zend_Http_Client::DELETE);
-			 
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Update Deployment Status operation initiates a change in deployment status.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @param string $status            The deployment status (running|suspended)
@@ -1221,14 +1221,14 @@ public function updateDeploymentStatusBySlot($serviceName, $deploymentSlot, $sta
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Status should be running|suspended.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
     	return $this->_updateDeploymentStatus($operationUrl, $status);
     }
-    
+
     /**
      * The Update Deployment Status operation initiates a change in deployment status.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
      * @param string $status            The deployment status (running|suspended)
@@ -1249,14 +1249,14 @@ public function updateDeploymentStatusByDeploymentId($serviceName, $deploymentId
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Status should be running|suspended.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId;
     	return $this->_updateDeploymentStatus($operationUrl, $status);
     }
-    
+
     /**
      * The Update Deployment Status operation initiates a change in deployment status.
-     * 
+     *
      * @param string $operationUrl		The operation url
      * @param string $status            The deployment status (running|suspended)
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1267,16 +1267,16 @@ protected function _updateDeploymentStatus($operationUrl, $status = 'running')
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<UpdateDeploymentStatus xmlns="http://schemas.microsoft.com/windowsazure"><Status>' . ucfirst($status) . '</Status></UpdateDeploymentStatus>');
-    		
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * Converts an XmlElement into a Zend_Service_WindowsAzure_Management_DeploymentInstance
-     * 
+     *
      * @param object $xmlService The XML Element
      * @return Zend_Service_WindowsAzure_Management_DeploymentInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1284,7 +1284,7 @@ protected function _updateDeploymentStatus($operationUrl, $status = 'running')
     protected function _convertXmlElementToDeploymentInstance($xmlService)
     {
 		if (!is_null($xmlService)) {
-			
+
 			$returnValue = new Zend_Service_WindowsAzure_Management_DeploymentInstance(
 				(string)$xmlService->Name,
 				(string)$xmlService->DeploymentSlot,
@@ -1299,16 +1299,16 @@ protected function _convertXmlElementToDeploymentInstance($xmlService)
 				(string)$xmlService->CurrentUpgradeDomain,
 				(string)$xmlService->UpgradeDomainCount
 			);
-				
+
 			// Append role instances
 			if ($xmlService->RoleInstanceList && $xmlService->RoleInstanceList->RoleInstance) {
 				$xmlRoleInstances = $xmlService->RoleInstanceList->RoleInstance;
 				if (count($xmlService->RoleInstanceList->RoleInstance) == 1) {
 		    	    $xmlRoleInstances = array($xmlService->RoleInstanceList->RoleInstance);
 		    	}
-		    		
+
 				$roleInstances = array();
-				if (!is_null($xmlRoleInstances)) {				
+				if (!is_null($xmlRoleInstances)) {
 					for ($i = 0; $i < count($xmlRoleInstances); $i++) {
 						$roleInstances[] = array(
 						    'rolename' => (string)$xmlRoleInstances[$i]->RoleName,
@@ -1317,37 +1317,37 @@ protected function _convertXmlElementToDeploymentInstance($xmlService)
 						);
 					}
 				}
-				
+
 				$returnValue->RoleInstanceList = $roleInstances;
 			}
-			
+
 			// Append roles
 			if ($xmlService->RoleList && $xmlService->RoleList->Role) {
 				$xmlRoles = $xmlService->RoleList->Role;
 				if (count($xmlService->RoleList->Role) == 1) {
 		    	    $xmlRoles = array($xmlService->RoleList->Role);
 		    	}
-	    		
+
 				$roles = array();
-				if (!is_null($xmlRoles)) {				
+				if (!is_null($xmlRoles)) {
 					for ($i = 0; $i < count($xmlRoles); $i++) {
 						$roles[] = array(
 						    'rolename' => (string)$xmlRoles[$i]->RoleName,
-						    'osversion' => (!is_null($xmlRoles[$i]->OsVersion) ? (string)$xmlRoles[$i]->OsVersion : (string)$xmlRoles[$i]->OperatingSystemVersion)					
+						    'osversion' => (!is_null($xmlRoles[$i]->OsVersion) ? (string)$xmlRoles[$i]->OsVersion : (string)$xmlRoles[$i]->OperatingSystemVersion)
 						);
 					}
 				}
 				$returnValue->RoleList = $roles;
 			}
-				
+
 			return $returnValue;
 		}
 		return null;
     }
-    
+
     /**
      * Updates a deployment's role instance count.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @param string|array $roleName	The role name
@@ -1368,19 +1368,19 @@ public function setInstanceCountBySlot($serviceName, $deploymentSlot, $roleName,
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Role name name should be specified.');
     	}
-    	
+
 		// Get configuration
 		$deployment = $this->getDeploymentBySlot($serviceName, $deploymentSlot);
 		$configuration = $deployment->Configuration;
 		$configuration = $this->_updateInstanceCountInConfiguration($roleName, $instanceCount, $configuration);
-		
+
 		// Update configuration
-		$this->configureDeploymentBySlot($serviceName, $deploymentSlot, $configuration);		
+		$this->configureDeploymentBySlot($serviceName, $deploymentSlot, $configuration);
 	}
-	
+
     /**
      * Updates a deployment's role instance count.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @param string|array $roleName	The role name
@@ -1401,19 +1401,19 @@ public function setInstanceCountByDeploymentId($serviceName, $deploymentId, $rol
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Role name name should be specified.');
     	}
-    	
+
 		// Get configuration
 		$deployment = $this->getDeploymentByDeploymentId($serviceName, $deploymentId);
 		$configuration = $deployment->Configuration;
 		$configuration = $this->_updateInstanceCountInConfiguration($roleName, $instanceCount, $configuration);
-		
+
 		// Update configuration
 		$this->configureDeploymentByDeploymentId($serviceName, $deploymentId, $configuration);
     }
-	
+
     /**
      * Updates instance count in configuration XML.
-     * 
+     *
      * @param string|array $roleName			The role name
      * @param string|array $instanceCount		The instance count
      * @param string $configuration             XML configuration represented as a string
@@ -1431,32 +1431,32 @@ protected function _updateInstanceCountInConfiguration($roleName, $instanceCount
 		$configuration = preg_replace('/(<\?xml[^?]+?)utf-16/i', '$1utf-8', $configuration);
 		//$configuration = '<?xml version="1.0">' . substr($configuration, strpos($configuration, '>') + 2);
 
-		$xml = Zend_Xml_Security::scan($configuration); 
-		
+		$xml = Zend_Xml_Security::scan($configuration);
+
 		// http://www.php.net/manual/en/simplexmlelement.xpath.php#97818
 		$namespaces = $xml->getDocNamespaces();
-	    $xml->registerXPathNamespace('__empty_ns', $namespaces['']); 
-	
+	    $xml->registerXPathNamespace('__empty_ns', $namespaces['']);
+
 		for ($i = 0; $i < count($roleName); $i++) {
 			$elements = $xml->xpath('//__empty_ns:Role[@name="' . $roleName[$i] . '"]/__empty_ns:Instances');
-	
+
 			if (count($elements) == 1) {
 				$element = $elements[0];
 				$element['count'] = $instanceCount[$i];
-			} 
+			}
 		}
-		
+
 		$configuration = $xml->asXML();
 		//$configuration = preg_replace('/(<\?xml[^?]+?)utf-8/i', '$1utf-16', $configuration);
 
 		return $configuration;
 	}
-    
+
     /**
      * The Change Deployment Configuration request may be specified as follows.
      * Note that you can change a deployment's configuration either by specifying the deployment
-     * environment (staging or production), or by specifying the deployment's unique name. 
-     * 
+     * environment (staging or production), or by specifying the deployment's unique name.
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @param string $configuration     XML configuration represented as a string
@@ -1477,20 +1477,20 @@ public function configureDeploymentBySlot($serviceName, $deploymentSlot, $config
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Configuration name should be specified.');
     	}
-    	
+
         if (@file_exists($configuration)) {
     		$configuration = utf8_decode(file_get_contents($configuration));
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
     	return $this->_configureDeployment($operationUrl, $configuration);
     }
-    
+
     /**
      * The Change Deployment Configuration request may be specified as follows.
      * Note that you can change a deployment's configuration either by specifying the deployment
-     * environment (staging or production), or by specifying the deployment's unique name. 
-     * 
+     * environment (staging or production), or by specifying the deployment's unique name.
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
      * @param string $configuration     XML configuration represented as a string
@@ -1510,20 +1510,20 @@ public function configureDeploymentByDeploymentId($serviceName, $deploymentId, $
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Configuration name should be specified.');
     	}
-    	
+
         if (@file_exists($configuration)) {
     		$configuration = utf8_decode(file_get_contents($configuration));
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId;
     	return $this->_configureDeployment($operationUrl, $configuration);
     }
-    
+
     /**
      * The Change Deployment Configuration request may be specified as follows.
      * Note that you can change a deployment's configuration either by specifying the deployment
-     * environment (staging or production), or by specifying the deployment's unique name. 
-     * 
+     * environment (staging or production), or by specifying the deployment's unique name.
+     *
      * @param string $operationUrl		The operation url
      * @param string $configuration     XML configuration represented as a string
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1537,16 +1537,16 @@ protected function _configureDeployment($operationUrl, $configuration)
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
     		'<ChangeConfiguration xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration></ChangeConfiguration>');
-			 
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Upgrade Deployment operation initiates an upgrade.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
 	 * @param string $label             A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription.
@@ -1588,18 +1588,18 @@ public function upgradeDeploymentBySlot($serviceName, $deploymentSlot, $label, $
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Mode should be auto|manual.');
     	}
-    	
+
     	if (@file_exists($configuration)) {
     		$configuration = utf8_decode(file_get_contents($configuration));
     	}
-    	
+
 		$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
-    	return $this->_upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade);  	
+    	return $this->_upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade);
     }
-    
+
     /**
      * The Upgrade Deployment operation initiates an upgrade.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
 	 * @param string $label             A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription.
@@ -1640,19 +1640,19 @@ public function upgradeDeploymentByDeploymentId($serviceName, $deploymentId, $la
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Mode should be auto|manual.');
     	}
-    	
+
     	if (@file_exists($configuration)) {
     		$configuration = utf8_decode(file_get_contents($configuration));
     	}
-    	
+
 		$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId;
-    	return $this->_upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade);  	
+    	return $this->_upgradeDeployment($operationUrl, $label, $packageUrl, $configuration, $mode, $roleToUpgrade);
     }
-    
-    
+
+
     /**
      * The Upgrade Deployment operation initiates an upgrade.
-     * 
+     *
      * @param string $operationUrl		The operation url
 	 * @param string $label             A URL that refers to the location of the service package in the Blob service. The service package must be located in a storage account beneath the same subscription.
 	 * @param string $packageUrl        The service configuration file for the deployment.
@@ -1665,21 +1665,21 @@ protected function _upgradeDeployment($operationUrl, $label, $packageUrl, $confi
     {
     	// Clean up the configuration
     	$conformingConfiguration = $this->_cleanConfiguration($configuration);
-    	
+
         $response = $this->_performRequest($operationUrl . '/', '?comp=upgrade',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
-    		'<UpgradeDeployment xmlns="http://schemas.microsoft.com/windowsazure"><Mode>' . ucfirst($mode) . '</Mode><PackageUrl>' . $packageUrl . '</PackageUrl><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration><Label>' . base64_encode($label) . '</Label>' . (!is_null($roleToUpgrade) ? '<RoleToUpgrade>' . $roleToUpgrade . '</RoleToUpgrade>' : '') . '</UpgradeDeployment>');		
-    		
+    		'<UpgradeDeployment xmlns="http://schemas.microsoft.com/windowsazure"><Mode>' . ucfirst($mode) . '</Mode><PackageUrl>' . $packageUrl . '</PackageUrl><Configuration>' . base64_encode($conformingConfiguration) . '</Configuration><Label>' . base64_encode($label) . '</Label>' . (!is_null($roleToUpgrade) ? '<RoleToUpgrade>' . $roleToUpgrade . '</RoleToUpgrade>' : '') . '</UpgradeDeployment>');
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Walk Upgrade Domain operation specifies the next upgrade domain to be walked during an in-place upgrade.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
 	 * @param int $upgradeDomain     An integer value that identifies the upgrade domain to walk. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on.
@@ -1696,14 +1696,14 @@ public function walkUpgradeDomainBySlot($serviceName, $deploymentSlot, $upgradeD
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Deployment slot should be production|staging.');
     	}
-    	
+
 		$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot;
-    	return $this->_walkUpgradeDomain($operationUrl, $upgradeDomain);  	
+    	return $this->_walkUpgradeDomain($operationUrl, $upgradeDomain);
     }
-    
+
     /**
      * The Walk Upgrade Domain operation specifies the next upgrade domain to be walked during an in-place upgrade.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
 	 * @param int $upgradeDomain     An integer value that identifies the upgrade domain to walk. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on.
@@ -1719,15 +1719,15 @@ public function walkUpgradeDomainByDeploymentId($serviceName, $deploymentId, $up
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Deployment ID should be specified.');
     	}
-    	
+
 		$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId;
-    	return $this->_walkUpgradeDomain($operationUrl, $upgradeDomain);  	
+    	return $this->_walkUpgradeDomain($operationUrl, $upgradeDomain);
     }
-    
-    
+
+
     /**
      * The Walk Upgrade Domain operation specifies the next upgrade domain to be walked during an in-place upgrade.
-     * 
+     *
      * @param string $operationUrl   The operation url
 	 * @param int $upgradeDomain     An integer value that identifies the upgrade domain to walk. Upgrade domains are identified with a zero-based index: the first upgrade domain has an ID of 0, the second has an ID of 1, and so on.
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1737,18 +1737,18 @@ protected function _walkUpgradeDomain($operationUrl, $upgradeDomain = 0)
         $response = $this->_performRequest($operationUrl . '/', '?comp=walkupgradedomain',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
-    		'<WalkUpgradeDomain xmlns="http://schemas.microsoft.com/windowsazure"><UpgradeDomain>' . $upgradeDomain . '</UpgradeDomain></WalkUpgradeDomain>');		
+    		'<WalkUpgradeDomain xmlns="http://schemas.microsoft.com/windowsazure"><UpgradeDomain>' . $upgradeDomain . '</UpgradeDomain></WalkUpgradeDomain>');
 
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Reboot Role Instance operation requests a reboot of a role instance
      * that is running in a deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @param string $roleInstanceName  The role instance name
@@ -1769,15 +1769,15 @@ public function rebootRoleInstanceBySlot($serviceName, $deploymentSlot, $roleIns
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot . '/roleinstances/' . $roleInstanceName;
     	return $this->_rebootOrReimageRoleInstance($operationUrl, 'reboot');
     }
-    
+
     /**
      * The Reboot Role Instance operation requests a reboot of a role instance
      * that is running in a deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	The deployment ID as listed on the Windows Azure management portal
      * @param string $roleInstanceName  The role instance name
@@ -1797,7 +1797,7 @@ public function rebootRoleInstanceByDeploymentId($serviceName, $deploymentId, $r
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId . '/roleinstances/' . $roleInstanceName;
     	return $this->_rebootOrReimageRoleInstance($operationUrl, 'reboot');
     }
@@ -1805,7 +1805,7 @@ public function rebootRoleInstanceByDeploymentId($serviceName, $deploymentId, $r
     /**
      * The Reimage Role Instance operation requests a reimage of a role instance
      * that is running in a deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentSlot	The deployment slot (production or staging)
      * @param string $roleInstanceName  The role instance name
@@ -1826,15 +1826,15 @@ public function reimageRoleInstanceBySlot($serviceName, $deploymentSlot, $roleIn
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deploymentslots/' . $deploymentSlot . '/roleinstances/' . $roleInstanceName;
     	return $this->_rebootOrReimageRoleInstance($operationUrl, 'reimage');
     }
-    
+
     /**
      * The Reimage Role Instance operation requests a reimage of a role instance
      * that is running in a deployment.
-     * 
+     *
      * @param string $serviceName		The service name
      * @param string $deploymentId	    The deployment ID as listed on the Windows Azure management portal
      * @param string $roleInstanceName  The role instance name
@@ -1854,14 +1854,14 @@ public function reimageRoleInstanceByDeploymentId($serviceName, $deploymentId, $
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Role instance name should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/deployments/' . $deploymentId . '/roleinstances/' . $roleInstanceName;
     	return $this->_rebootOrReimageRoleInstance($operationUrl, 'reimage');
     }
-    
+
     /**
      * Reboots or reimages a role instance.
-     * 
+     *
      * @param string $operationUrl		The operation url
      * @param string $operation The operation (reboot|reimage)
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1869,17 +1869,17 @@ public function reimageRoleInstanceByDeploymentId($serviceName, $deploymentId, $
     protected function _rebootOrReimageRoleInstance($operationUrl, $operation = 'reboot')
     {
         $response = $this->_performRequest($operationUrl, '?comp=' . $operation, Zend_Http_Client::POST);
-    		
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The List Certificates operation lists all certificates associated with
      * the specified hosted service.
-     * 
+     *
      * @param string $serviceName		The service name
      * @return array Array of Zend_Service_WindowsAzure_Management_CertificateInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -1890,7 +1890,7 @@ public function listCertificates($serviceName)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Service name should be specified.');
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates';
         $response = $this->_performRequest($operationUrl);
 
@@ -1907,8 +1907,8 @@ public function listCertificates($serviceName)
     		}
 
 			$services = array();
-			if (!is_null($xmlServices)) {				
-				
+			if (!is_null($xmlServices)) {
+
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_CertificateInstance(
 					    (string)$xmlServices[$i]->CertificateUrl,
@@ -1924,10 +1924,10 @@ public function listCertificates($serviceName)
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Get Certificate operation returns the public data for the specified certificate.
-     * 
+     *
      * @param string $serviceName|$certificateUrl	The service name -or- the certificate URL
      * @param string $algorithm         			Algorithm
      * @param string $thumbprint        			Thumbprint
@@ -1944,17 +1944,17 @@ public function getCertificate($serviceName, $algorithm = '', $thumbprint = '')
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Algorithm and thumbprint should be specified.');
     	}
-    	
+
     	$operationUrl = str_replace($this->getBaseUrl(), '', $serviceName);
     	if (strpos($serviceName, 'https') === false) {
     		$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates/' . $algorithm . '-' . strtoupper($thumbprint);
     	}
-    	
+
         $response = $this->_performRequest($operationUrl);
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
 			return new Zend_Service_WindowsAzure_Management_CertificateInstance(
 				$this->getBaseUrl() . $operationUrl,
 				$algorithm,
@@ -1966,10 +1966,10 @@ public function getCertificate($serviceName, $algorithm = '', $thumbprint = '')
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Add Certificate operation adds a certificate to the subscription.
-     * 
+     *
      * @param string $serviceName         The service name
      * @param string $certificateData     Certificate data
      * @param string $certificatePassword The certificate password
@@ -1994,11 +1994,11 @@ public function addCertificate($serviceName, $certificateData, $certificatePassw
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Certificate format should be "pfx".');
     	}
-    	
+
     	if (@file_exists($certificateData)) {
     		$certificateData = file_get_contents($certificateData);
     	}
-    	
+
     	$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates';
         $response = $this->_performRequest($operationUrl, '',
     		Zend_Http_Client::POST,
@@ -2010,10 +2010,10 @@ public function addCertificate($serviceName, $certificateData, $certificatePassw
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Delete Certificate operation deletes a certificate from the subscription's certificate store.
-     * 
+     *
      * @param string $serviceName|$certificateUrl	The service name -or- the certificate URL
      * @param string $algorithm         			Algorithm
      * @param string $thumbprint        			Thumbprint
@@ -2029,12 +2029,12 @@ public function deleteCertificate($serviceName, $algorithm = '', $thumbprint = '
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Algorithm and thumbprint should be specified.');
     	}
-    	
+
     	$operationUrl = str_replace($this->getBaseUrl(), '', $serviceName);
     	if (strpos($serviceName, 'https') === false) {
     		$operationUrl = self::OP_HOSTED_SERVICES . '/' . $serviceName . '/certificates/' . $algorithm . '-' . strtoupper($thumbprint);
     	}
-    	
+
         $response = $this->_performRequest($operationUrl, '', Zend_Http_Client::DELETE);
 
     	if (!$response->isSuccessful()) {
@@ -2042,11 +2042,11 @@ public function deleteCertificate($serviceName, $algorithm = '', $thumbprint = '
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The List Affinity Groups operation lists the affinity groups associated with
      * the specified subscription.
-     * 
+     *
      * @return array Array of Zend_Service_WindowsAzure_Management_AffinityGroupInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
      */
@@ -2056,7 +2056,7 @@ public function listAffinityGroups()
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
     		if (!$result->AffinityGroup) {
 				return array();
 			}
@@ -2065,10 +2065,10 @@ public function listAffinityGroups()
     		} else {
     		    $xmlServices = array($result->AffinityGroup);
     		}
-    		
+
 			$services = array();
-			if (!is_null($xmlServices)) {				
-				
+			if (!is_null($xmlServices)) {
+
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_AffinityGroupInstance(
 					    (string)$xmlServices[$i]->Name,
@@ -2084,14 +2084,14 @@ public function listAffinityGroups()
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Create Affinity Group operation creates a new affinity group for the specified subscription.
-     * 
+     *
      * @param string $name A name for the affinity group that is unique to the subscription.
      * @param string $label A label for the affinity group. The label may be up to 100 characters in length.
      * @param string $description A description for the affinity group. The description may be up to 1024 characters in length.
-     * @param string $location The location where the affinity group will be created. To list available locations, use the List Locations operation. 
+     * @param string $location The location where the affinity group will be created. To list available locations, use the List Locations operation.
      */
     public function createAffinityGroup($name, $label, $description = '', $location = '')
     {
@@ -2115,24 +2115,24 @@ public function createAffinityGroup($name, $label, $description = '', $location
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Location should be specified.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_AFFINITYGROUPS, '',
     		Zend_Http_Client::POST,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
-    		'<CreateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure"><Name>' . $name . '</Name><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description><Location>' . $location . '</Location></CreateAffinityGroup>');	
-    		
+    		'<CreateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure"><Name>' . $name . '</Name><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description><Location>' . $location . '</Location></CreateAffinityGroup>');
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Update Affinity Group operation updates the label and/or the description for an affinity group for the specified subscription.
-     * 
+     *
      * @param string $name The name for the affinity group that should be updated.
      * @param string $label A label for the affinity group. The label may be up to 100 characters in length.
-     * @param string $description A description for the affinity group. The description may be up to 1024 characters in length. 
+     * @param string $description A description for the affinity group. The description may be up to 1024 characters in length.
      */
     public function updateAffinityGroup($name, $label, $description = '')
     {
@@ -2152,21 +2152,21 @@ public function updateAffinityGroup($name, $label, $description = '')
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Description is too long. The maximum length is 1024 characters.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_AFFINITYGROUPS . '/' . $name, '',
     		Zend_Http_Client::PUT,
     		array('Content-Type' => 'application/xml; charset=utf-8'),
-    		'<UpdateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure"><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description></UpdateAffinityGroup>');	
-    		
+    		'<UpdateAffinityGroup xmlns="http://schemas.microsoft.com/windowsazure"><Label>' . base64_encode($label) . '</Label><Description>' . $description . '</Description></UpdateAffinityGroup>');
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Delete Affinity Group operation deletes an affinity group in the specified subscription.
-     * 
+     *
      * @param string $name The name for the affinity group that should be deleted.
      */
     public function deleteAffinityGroup($name)
@@ -2175,20 +2175,20 @@ public function deleteAffinityGroup($name)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Affinity group name should be specified.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_AFFINITYGROUPS . '/' . $name, '',
     		Zend_Http_Client::DELETE);
-    		
+
     	if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The Get Affinity Group Properties operation returns the
      * system properties associated with the specified affinity group.
-     * 
+     *
      * @param string $affinityGroupName The affinity group name.
      * @return Zend_Service_WindowsAzure_Management_AffinityGroupInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
@@ -2199,12 +2199,12 @@ public function getAffinityGroupProperties($affinityGroupName)
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
     		throw new Zend_Service_WindowsAzure_Management_Exception('Affinity group name should be specified.');
     	}
-    	
+
         $response = $this->_performRequest(self::OP_AFFINITYGROUPS . '/' . $affinityGroupName);
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
 			$affinityGroup = new Zend_Service_WindowsAzure_Management_AffinityGroupInstance(
 				$affinityGroupName,
 				(string)$result->Label,
@@ -2218,9 +2218,9 @@ public function getAffinityGroupProperties($affinityGroupName)
 		    } else {
 		    	$xmlService = array($result->HostedServices->HostedService);
 		    }
-		    		
+
 			$services = array();
-			if (!is_null($xmlService)) {				
+			if (!is_null($xmlService)) {
 				for ($i = 0; $i < count($xmlService); $i++) {
 					$services[] = array(
 						'url' => (string)$xmlService[$i]->Url,
@@ -2229,16 +2229,16 @@ public function getAffinityGroupProperties($affinityGroupName)
 				}
 			}
 			$affinityGroup->HostedServices = $services;
-			
+
 			// Storage services
 			if (count($result->StorageServices->StorageService) > 1) {
 		    	$xmlService = $result->StorageServices->StorageService;
 		    } else {
 		    	$xmlService = array($result->StorageServices->StorageService);
 		    }
-		    		
+
 			$services = array();
-			if (!is_null($xmlService)) {				
+			if (!is_null($xmlService)) {
 				for ($i = 0; $i < count($xmlService); $i++) {
 					$services[] = array(
 						'url' => (string)$xmlService[$i]->Url,
@@ -2246,19 +2246,19 @@ public function getAffinityGroupProperties($affinityGroupName)
 					);
 				}
 			}
-			$affinityGroup->StorageServices = $services;	
-			
+			$affinityGroup->StorageServices = $services;
+
 			return $affinityGroup;
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Management/Exception.php';
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The List Locations operation lists all of the data center locations
      * that are valid for your subscription.
-     * 
+     *
      * @return array Array of Zend_Service_WindowsAzure_Management_LocationInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
      */
@@ -2268,7 +2268,7 @@ public function listLocations()
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
     		if (!$result->Location) {
 				return array();
 			}
@@ -2277,10 +2277,10 @@ public function listLocations()
     		} else {
     		    $xmlServices = array($result->Location);
     		}
-    		
+
 			$services = array();
-			if (!is_null($xmlServices)) {				
-				
+			if (!is_null($xmlServices)) {
+
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_LocationInstance(
 					    (string)$xmlServices[$i]->Name
@@ -2293,7 +2293,7 @@ public function listLocations()
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The List Operating Systems operation lists the versions of the guest operating system
      * that are currently available in Windows Azure. The 2010-10-28 version of List Operating
@@ -2302,7 +2302,7 @@ public function listLocations()
      * operating system that is substantially compatible with Windows Server 2008 SP2,
      * and the Windows Azure guest operating system that is substantially compatible with
      * Windows Server 2008 R2.
-     * 
+     *
      * @return array Array of Zend_Service_WindowsAzure_Management_OperatingSystemInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
      */
@@ -2312,7 +2312,7 @@ public function listOperatingSystems()
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
     		if (!$result->OperatingSystem) {
 				return array();
 			}
@@ -2321,10 +2321,10 @@ public function listOperatingSystems()
     		} else {
     		    $xmlServices = array($result->OperatingSystem);
     		}
-    		
+
 			$services = array();
-			if (!is_null($xmlServices)) {				
-				
+			if (!is_null($xmlServices)) {
+
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_OperatingSystemInstance(
 					    (string)$xmlServices[$i]->Version,
@@ -2342,7 +2342,7 @@ public function listOperatingSystems()
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * The List OS Families operation lists the guest operating system families
      * available in Windows Azure, and also lists the operating system versions
@@ -2351,7 +2351,7 @@ public function listOperatingSystems()
      * substantially compatible with Windows Server 2008 SP2, and the Windows
      * Azure guest operating system that is substantially compatible with
      * Windows Server 2008 R2.
-     * 
+     *
      * @return array Array of Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance
      * @throws Zend_Service_WindowsAzure_Management_Exception
      */
@@ -2361,7 +2361,7 @@ public function listOperatingSystemFamilies()
 
     	if ($response->isSuccessful()) {
 			$result = $this->_parseResponse($response);
-			
+
     		if (!$result->OperatingSystemFamily) {
 				return array();
 			}
@@ -2370,24 +2370,24 @@ public function listOperatingSystemFamilies()
     		} else {
     		    $xmlServices = array($result->OperatingSystemFamily);
     		}
-    		
+
 			$services = array();
-			if (!is_null($xmlServices)) {				
-				
+			if (!is_null($xmlServices)) {
+
 				for ($i = 0; $i < count($xmlServices); $i++) {
 					$services[] = new Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance(
 					    (string)$xmlServices[$i]->Name,
 					    (string)$xmlServices[$i]->Label
 					);
-								
+
 					if (count($xmlServices[$i]->OperatingSystems->OperatingSystem) > 1) {
 		    		    $xmlOperatingSystems = $xmlServices[$i]->OperatingSystems->OperatingSystem;
 		    		} else {
 		    		    $xmlOperatingSystems = array($xmlServices[$i]->OperatingSystems->OperatingSystem);
 		    		}
-		    		
+
 					$operatingSystems = array();
-					if (!is_null($xmlOperatingSystems)) {				
+					if (!is_null($xmlOperatingSystems)) {
 						#require_once 'Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php';
 						for ($i = 0; $i < count($xmlOperatingSystems); $i++) {
 							$operatingSystems[] = new Zend_Service_WindowsAzure_Management_OperatingSystemInstance(
@@ -2409,10 +2409,10 @@ public function listOperatingSystemFamilies()
 			throw new Zend_Service_WindowsAzure_Management_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
     }
-    
+
     /**
      * Clean configuration
-     * 
+     *
      * @param string $configuration Configuration to clean.
      * @return string
      */
@@ -2420,7 +2420,7 @@ public function _cleanConfiguration($configuration) {
     	$configuration = str_replace('?<?', '<?', $configuration);
 		$configuration = str_replace("\r", "", $configuration);
 		$configuration = str_replace("\n", "", $configuration);
-		
+
 		return $configuration;
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php b/lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php
index 622baa5b192..8d42e4bbaa3 100644
--- a/lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/DeploymentInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Name            The name for the deployment. This name must be unique among other deployments for the specified hosted service.
  * @property string $DeploymentSlot  The environment to which the hosted service is deployed, either staging or production.
  * @property string $PrivateID       The unique identifier for this deployment.
@@ -49,10 +49,10 @@
  */
 class Zend_Service_WindowsAzure_Management_DeploymentInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $name            The name for the deployment. This name must be unique among other deployments for the specified hosted service.
      * @param string $deploymentSlot  The environment to which the hosted service is deployed, either staging or production.
      * @param string $privateID       The unique identifier for this deployment.
@@ -68,8 +68,8 @@ class Zend_Service_WindowsAzure_Management_DeploymentInstance
      * @param array  $roleInstanceList           The list of role instances.
      * @param array  $roleList                   The list of roles.
 	 */
-    public function __construct($name, $deploymentSlot, $privateID, $label, $url, $configuration, $status, $upgradeStatus, $upgradeType, $currentUpgradeDomainState, $currentUpgradeDomain, $upgradeDomainCount, $roleInstanceList = array(), $roleList = array()) 
-    {	        
+    public function __construct($name, $deploymentSlot, $privateID, $label, $url, $configuration, $status, $upgradeStatus, $upgradeType, $currentUpgradeDomainState, $currentUpgradeDomain, $upgradeDomainCount, $roleInstanceList = array(), $roleList = array())
+    {
         $this->_data = array(
             'name'                        => $name,
             'deploymentslot'              => $deploymentSlot,
@@ -84,7 +84,7 @@ public function __construct($name, $deploymentSlot, $privateID, $label, $url, $c
             'currentupgradedomain'        => $currentUpgradeDomain,
             'upgradedomaincount'          => $upgradeDomainCount,
             'roleinstancelist'            => $roleInstanceList,
-            'rolelist'                    => $roleList    
+            'rolelist'                    => $roleList
         );
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php b/lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php
index 31a664d3ea0..69cab123a62 100644
--- a/lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/HostedServiceInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Url             The address of the hosted service.
  * @property string $ServiceName     The name of the hosted service.
  * @property string $Description	 A description of the hosted service.
@@ -42,10 +42,10 @@
  */
 class Zend_Service_WindowsAzure_Management_HostedServiceInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $url             The address of the hosted service.
      * @param string $serviceName     The name of the hosted service.
 	 * @param string $description	  A description of the storage account.
@@ -54,8 +54,8 @@ class Zend_Service_WindowsAzure_Management_HostedServiceInstance
 	 * @param string $label           The label for the hosted service.
 	 * @param array  $deployments     Deployments for the hosted service.
 	 */
-    public function __construct($url, $serviceName, $description = '', $affinityGroup = '', $location = '', $label = '', $deployments = array()) 
-    {	        
+    public function __construct($url, $serviceName, $description = '', $affinityGroup = '', $location = '', $label = '', $deployments = array())
+    {
         $this->_data = array(
             'url'              => $url,
             'servicename'      => $serviceName,
diff --git a/lib/Zend/Service/WindowsAzure/Management/LocationInstance.php b/lib/Zend/Service/WindowsAzure/Management/LocationInstance.php
index 4326daeb111..e2554fd8bed 100644
--- a/lib/Zend/Service/WindowsAzure/Management/LocationInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/LocationInstance.php
@@ -31,21 +31,21 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Name         The location name.
  */
 class Zend_Service_WindowsAzure_Management_LocationInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
-     * @param string $name         The location name. 
+     *
+     * @param string $name         The location name.
 	 */
-    public function __construct($name) 
-    {	        
+    public function __construct($name)
+    {
         $this->_data = array(
-            'name'        => $name    
+            'name'        => $name
         );
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php b/lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php
index 80d6fe1ec89..4f91e3c3c4d 100644
--- a/lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/OperatingSystemFamilyInstance.php
@@ -31,23 +31,23 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Name              Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2. 
+ *
+ * @property string $Name              Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2.
  * @property string $Label             A label for the operating system version.
  * @property array  $OperatingSystems  A list of operating systems available under this operating system family.
  */
 class Zend_Service_WindowsAzure_Management_OperatingSystemFamilyInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
-     * @param string $name              Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2. 
+     *
+     * @param string $name              Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2.
      * @param string $label             A label for the operating system version.
      * @param array  $operatingSystems  A list of operating systems available under this operating system family.
 	 */
-    public function __construct($name, $label, $operatingSystems = array()) 
-    {	        
+    public function __construct($name, $label, $operatingSystems = array())
+    {
         $this->_data = array(
             'name'              => $name,
             'label'             => base64_decode($label),
diff --git a/lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php b/lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php
index cfd42cc8c84..41be13ceb18 100644
--- a/lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/OperatingSystemInstance.php
@@ -31,8 +31,8 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Version         The operating system version. This value corresponds to the configuration value for specifying that your service is to run on a particular version of the Windows Azure guest operating system. 
+ *
+ * @property string $Version         The operating system version. This value corresponds to the configuration value for specifying that your service is to run on a particular version of the Windows Azure guest operating system.
  * @property string $Label           A label for the operating system version.
  * @property string $IsDefault    	 Indicates whether this operating system version is the default version for a service that has not otherwise specified a particular version. The default operating system version is applied to services that are configured for auto-upgrade. An operating system family has exactly one default operating system version at any given time, for which the IsDefault element is set to true; for all other versions, IsDefault is set to false.
  * @property string $IsActive        Indicates whether this operating system version is currently active for running a service. If an operating system version is active, you can manually configure your service to run on that version.
@@ -41,26 +41,26 @@
  */
 class Zend_Service_WindowsAzure_Management_OperatingSystemInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
-     * @param string $version         The operating system version. This value corresponds to the configuration value for specifying that your service is to run on a particular version of the Windows Azure guest operating system. 
+     *
+     * @param string $version         The operating system version. This value corresponds to the configuration value for specifying that your service is to run on a particular version of the Windows Azure guest operating system.
      * @param string $label           A label for the operating system version.
      * @param string $isDefault    	  Indicates whether this operating system version is the default version for a service that has not otherwise specified a particular version. The default operating system version is applied to services that are configured for auto-upgrade. An operating system family has exactly one default operating system version at any given time, for which the IsDefault element is set to true; for all other versions, IsDefault is set to false.
      * @param string $isActive        Indicates whether this operating system version is currently active for running a service. If an operating system version is active, you can manually configure your service to run on that version.
      * @param string $family          Indicates which operating system family this version belongs to. A value of 1 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 SP2. A value of 2 corresponds to the Windows Azure guest operating system that is substantially compatible with Windows Server 2008 R2.
      * @param string $familyLabel     A label for the operating system family.
 	 */
-    public function __construct($version, $label, $isDefault, $isActive, $family, $familyLabel) 
-    {	        
+    public function __construct($version, $label, $isDefault, $isActive, $family, $familyLabel)
+    {
         $this->_data = array(
             'version'        => $version,
             'label'          => base64_decode($label),
             'isdefault'      => $isDefault,
             'isactive'       => $isActive,
             'family'         => $family,
-            'familylabel'    => base64_decode($familyLabel)        
+            'familylabel'    => base64_decode($familyLabel)
         );
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php b/lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php
index e7fb964bafa..76bf45c91db 100644
--- a/lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/OperationStatusInstance.php
@@ -31,30 +31,30 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Id              The request ID of the asynchronous request.
  * @property string $Status          The status of the asynchronous request. Possible values include InProgress, Succeeded, or Failed.
- * @property string $ErrorCode	     The management service error code returned if the asynchronous request failed. 
- * @property string $ErrorMessage    The management service error message returned if the asynchronous request failed. 
+ * @property string $ErrorCode	     The management service error code returned if the asynchronous request failed.
+ * @property string $ErrorMessage    The management service error message returned if the asynchronous request failed.
  */
 class Zend_Service_WindowsAzure_Management_OperationStatusInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $id              The request ID of the asynchronous request.
      * @param string $status          The status of the asynchronous request. Possible values include InProgress, Succeeded, or Failed.
-     * @param string $errorCode	      The management service error code returned if the asynchronous request failed. 
+     * @param string $errorCode	      The management service error code returned if the asynchronous request failed.
      * @param string $errorMessage    The management service error message returned if the asynchronous request failed.
 	 */
-    public function __construct($id, $status, $errorCode, $errorMessage) 
-    {	        
+    public function __construct($id, $status, $errorCode, $errorMessage)
+    {
         $this->_data = array(
             'id'              => $id,
             'status'          => $status,
             'errorcode'       => $errorCode,
-            'errormessage'    => $errorMessage     
+            'errormessage'    => $errorMessage
         );
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php b/lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php
index f56a36cd852..985ea069c16 100644
--- a/lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/Management/ServiceEntityAbstract.php
@@ -32,14 +32,14 @@ abstract class Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
 {
     /**
      * Data
-     * 
+     *
      * @var array
      */
     protected $_data = null;
-    
+
     /**
      * Magic overload for setting properties
-     * 
+     *
      * @param string $name     Name of the property
      * @param string $value    Value to set
      */
@@ -54,7 +54,7 @@ public function __set($name, $value) {
 
     /**
      * Magic overload for getting properties
-     * 
+     *
      * @param string $name     Name of the property
      */
     public function __get($name) {
diff --git a/lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php b/lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php
index 077f7b1f71f..e0f8106f6d6 100644
--- a/lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/StorageServiceInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Url             The address of the storage account.
  * @property string $ServiceName     The name of the storage account.
  * @property string $Description	 A description of the storage account.
@@ -41,10 +41,10 @@
  */
 class Zend_Service_WindowsAzure_Management_StorageServiceInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $url             The address of the storage account.
      * @param string $serviceName     The name of the storage account.
 	 * @param string $description	  A description of the storage account.
@@ -52,15 +52,15 @@ class Zend_Service_WindowsAzure_Management_StorageServiceInstance
 	 * @param string $location        The geo-location of the storage account in Windows Azure, if your storage account is not associated with an affinity group.
 	 * @param string $label           The label for the storage account.
 	 */
-    public function __construct($url, $serviceName, $description = '', $affinityGroup = '', $location = '', $label = '') 
-    {	        
+    public function __construct($url, $serviceName, $description = '', $affinityGroup = '', $location = '', $label = '')
+    {
         $this->_data = array(
             'url'              => $url,
             'servicename'      => $serviceName,
             'description'      => $description,
             'affinitygroup'    => $affinityGroup,
             'location'         => $location,
-            'label'            => base64_decode($label)        
+            'label'            => base64_decode($label)
         );
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php b/lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php
index dd30bf91887..eda0b72b080 100644
--- a/lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Management/SubscriptionOperationInstance.php
@@ -31,9 +31,9 @@
  * @subpackage Management
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $operationId The globally unique identifier (GUID) of the operation.
- * @property string $operationObjectId The target object for the operation. 
+ * @property string $operationObjectId The target object for the operation.
  * @property string $operationName The name of the performed operation.
  * @property array  $operationParameters The collection of parameters for the performed operation.
  * @property array  $operationCaller A collection of attributes that identifies the source of the operation.
@@ -41,19 +41,19 @@
  */
 class Zend_Service_WindowsAzure_Management_SubscriptionOperationInstance
 	extends Zend_Service_WindowsAzure_Management_ServiceEntityAbstract
-{    
+{
     /**
      * Constructor
-     * 
+     *
      * @param string $operationId The globally unique identifier (GUID) of the operation.
-     * @param string $operationObjectId The target object for the operation. 
+     * @param string $operationObjectId The target object for the operation.
      * @param string $operationName The name of the performed operation.
      * @param array  $operationParameters The collection of parameters for the performed operation.
      * @param array  $operationCaller A collection of attributes that identifies the source of the operation.
      * @param array  $operationStatus The current status of the operation.
      */
-    public function __construct($operationId, $operationObjectId, $operationName, $operationParameters = array(), $operationCaller = array(), $operationStatus = array()) 
-    {	        
+    public function __construct($operationId, $operationObjectId, $operationName, $operationParameters = array(), $operationCaller = array(), $operationStatus = array())
+    {
         $this->_data = array(
             'operationid'          => $operationId,
 	        'operationobjectid'    => $operationObjectId,
@@ -63,10 +63,10 @@ public function __construct($operationId, $operationObjectId, $operationName, $o
 	        'operationstatus'      => $operationStatus
         );
     }
-    
+
 	/**
 	 * Add operation parameter
-	 * 
+	 *
  	 * @param	string	$name	Name
  	 * @param	string	$value  Value
 	 */
diff --git a/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php b/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
index bdf586c6dc9..bdbe0b7c86f 100644
--- a/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
+++ b/lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
@@ -36,7 +36,7 @@ class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_Windows
 {
     /**
      * Execute function under retry policy
-     * 
+     *
      * @param string|array $function       Function to execute
      * @param array        $parameters     Parameters for function call
      * @return mixed
@@ -44,7 +44,7 @@ class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_Windows
     public function execute($function, $parameters = array())
     {
         $returnValue = null;
-        
+
         try
         {
             $returnValue = call_user_func_array($function, $parameters);
diff --git a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
index 5e9e38e8c34..43871fad796 100644
--- a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
+++ b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
@@ -36,21 +36,21 @@ class Zend_Service_WindowsAzure_RetryPolicy_RetryN extends Zend_Service_WindowsA
 {
     /**
      * Number of retries
-     * 
+     *
      * @var int
      */
     protected $_retryCount = 1;
-    
+
     /**
      * Interval between retries (in milliseconds)
-     * 
+     *
      * @var int
      */
     protected $_retryInterval = 0;
-    
+
     /**
      * Constructor
-     * 
+     *
      * @param int $count                    Number of retries
      * @param int $intervalBetweenRetries   Interval between retries (in milliseconds)
      */
@@ -59,10 +59,10 @@ public function __construct($count = 1, $intervalBetweenRetries = 0)
         $this->_retryCount = $count;
         $this->_retryInterval = $intervalBetweenRetries;
     }
-    
+
     /**
      * Execute function under retry policy
-     * 
+     *
      * @param string|array $function       Function to execute
      * @param array        $parameters     Parameters for function call
      * @return mixed
@@ -70,7 +70,7 @@ public function __construct($count = 1, $intervalBetweenRetries = 0)
     public function execute($function, $parameters = array())
     {
         $returnValue = null;
-        
+
         for ($retriesLeft = $this->_retryCount; $retriesLeft >= 0; --$retriesLeft) {
             try {
                 $returnValue = call_user_func_array($function, $parameters);
@@ -80,7 +80,7 @@ public function execute($function, $parameters = array())
                     #require_once 'Zend/Service/WindowsAzure/RetryPolicy/Exception.php';
                     throw new Zend_Service_WindowsAzure_RetryPolicy_Exception("Exceeded retry count of " . $this->_retryCount . ". " . $ex->getMessage());
                 }
-                    
+
                 usleep($this->_retryInterval * 1000);
             }
         }
diff --git a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
index 8b8245b9139..8018946c901 100644
--- a/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
@@ -41,26 +41,26 @@ abstract class Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
 {
     /**
      * Execute function under retry policy
-     * 
+     *
      * @param string|array $function       Function to execute
      * @param array        $parameters     Parameters for function call
      * @return mixed
      */
     public abstract function execute($function, $parameters = array());
-    
+
     /**
      * Create a Zend_Service_WindowsAzure_RetryPolicy_NoRetry instance
-     * 
+     *
      * @return Zend_Service_WindowsAzure_RetryPolicy_NoRetry
      */
     public static function noRetry()
     {
         return new Zend_Service_WindowsAzure_RetryPolicy_NoRetry();
     }
-    
+
     /**
      * Create a Zend_Service_WindowsAzure_RetryPolicy_RetryN instance
-     * 
+     *
      * @param int $count                    Number of retries
      * @param int $intervalBetweenRetries   Interval between retries (in milliseconds)
      * @return Zend_Service_WindowsAzure_RetryPolicy_RetryN
diff --git a/lib/Zend/Service/WindowsAzure/SessionHandler.php b/lib/Zend/Service/WindowsAzure/SessionHandler.php
index 05363364978..f02ae8b3ff7 100644
--- a/lib/Zend/Service/WindowsAzure/SessionHandler.php
+++ b/lib/Zend/Service/WindowsAzure/SessionHandler.php
@@ -31,47 +31,47 @@ class Zend_Service_WindowsAzure_SessionHandler
 {
 	/**
 	 * Maximal property size in table storage.
-	 * 
+	 *
 	 * @var int
 	 * @see http://msdn.microsoft.com/en-us/library/dd179338.aspx
 	 */
 	const MAX_TS_PROPERTY_SIZE = 65536;
-	
+
 	/** Storage backend type */
 	const STORAGE_TYPE_TABLE = 'table';
 	const STORAGE_TYPE_BLOB = 'blob';
-	
+
     /**
      * Storage back-end
-     * 
+     *
      * @var Zend_Service_WindowsAzure_Storage_Table|Zend_Service_WindowsAzure_Storage_Blob
      */
     protected $_storage;
-    
+
     /**
      * Storage backend type
-     * 
+     *
      * @var string
      */
     protected $_storageType;
-    
+
     /**
      * Session container name
-     * 
+     *
      * @var string
      */
     protected $_sessionContainer;
-    
+
     /**
      * Session container partition
-     * 
+     *
      * @var string
      */
     protected $_sessionContainerPartition;
-	
+
     /**
      * Creates a new Zend_Service_WindowsAzure_SessionHandler instance
-     * 
+     *
      * @param Zend_Service_WindowsAzure_Storage_Table|Zend_Service_WindowsAzure_Storage_Blob $storage Storage back-end, can be table storage and blob storage
      * @param string $sessionContainer Session container name
      * @param string $sessionContainerPartition Session container partition
@@ -83,29 +83,29 @@ public function __construct(Zend_Service_WindowsAzure_Storage $storage, $session
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Invalid storage back-end given. Storage back-end should be of type Zend_Service_WindowsAzure_Storage_Table or Zend_Service_WindowsAzure_Storage_Blob.');
 		}
-		
+
 		// Validate other parameters
 		if ($sessionContainer == '' || $sessionContainerPartition == '') {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Session container and session partition should be specified.');
 		}
-		
+
 		// Determine storage type
 		$storageType = self::STORAGE_TYPE_TABLE;
 		if ($storage instanceof Zend_Service_WindowsAzure_Storage_Blob) {
 			$storageType = self::STORAGE_TYPE_BLOB;
 		}
-		
+
 	    // Set properties
 		$this->_storage = $storage;
 		$this->_storageType = $storageType;
 		$this->_sessionContainer = $sessionContainer;
 		$this->_sessionContainerPartition = $sessionContainerPartition;
 	}
-	
+
 	/**
 	 * Registers the current session handler as PHP's session handler
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public function register()
@@ -118,10 +118,10 @@ public function register()
                                         array($this, 'gc')
         );
 	}
-	
+
     /**
      * Open the session store
-     * 
+     *
      * @return bool
      */
     public function open()
@@ -132,24 +132,24 @@ public function open()
     	} else if ($this->_storageType == self::STORAGE_TYPE_BLOB) {
     		$this->_storage->createContainerIfNotExists($this->_sessionContainer);
     	}
-    	
+
 		// Ok!
 		return true;
     }
 
     /**
      * Close the session store
-     * 
+     *
      * @return bool
      */
     public function close()
     {
         return true;
     }
-    
+
     /**
      * Read a specific session
-     * 
+     *
      * @param int $id Session Id
      * @return string
      */
@@ -187,10 +187,10 @@ public function read($id)
 	        }
     	}
     }
-    
+
     /**
      * Write a specific session
-     * 
+     *
      * @param int $id Session Id
      * @param string $serializedData Serialized PHP object
      * @throws Exception
@@ -202,16 +202,16 @@ public function write($id, $serializedData)
     	if (strlen($serializedData) >= self::MAX_TS_PROPERTY_SIZE && $this->_storageType == self::STORAGE_TYPE_TABLE) {
     		throw new Zend_Service_WindowsAzure_Exception('Session data exceeds the maximum allowed size of ' . self::MAX_TS_PROPERTY_SIZE . ' bytes that can be stored using table storage. Consider switching to a blob storage back-end or try reducing session data size.');
     	}
-    	
+
     	// Store data
        	if ($this->_storageType == self::STORAGE_TYPE_TABLE) {
     		// In table storage
        	    $sessionRecord = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($this->_sessionContainerPartition, $id);
 	        $sessionRecord->sessionExpires = time();
 	        $sessionRecord->serializedData = $serializedData;
-	        
+
 	        $sessionRecord->setAzurePropertyType('sessionExpires', 'Edm.Int32');
-	
+
 	        try
 	        {
 	            $this->_storage->updateEntity($this->_sessionContainer, $sessionRecord);
@@ -230,10 +230,10 @@ public function write($id, $serializedData)
     		);
     	}
     }
-    
+
     /**
      * Destroy a specific session
-     * 
+     *
      * @param int $id Session Id
      * @return boolean
      */
@@ -250,7 +250,7 @@ public function destroy($id)
 	                $id
 	            );
 	            $this->_storage->deleteEntity($this->_sessionContainer, $sessionRecord);
-	            
+
 	            return true;
 	        }
 	        catch (Zend_Service_WindowsAzure_Exception $ex)
@@ -265,7 +265,7 @@ public function destroy($id)
     				$this->_sessionContainer,
     				$this->_sessionContainerPartition . '/' . $id
     			);
-	            
+
 	            return true;
 	        }
 	        catch (Zend_Service_WindowsAzure_Exception $ex)
@@ -274,10 +274,10 @@ public function destroy($id)
 	        }
     	}
     }
-    
+
     /**
      * Garbage collector
-     * 
+     *
      * @param int $lifeTime Session maximal lifetime
      * @see session.gc_divisor  100
      * @see session.gc_maxlifetime 1440
diff --git a/lib/Zend/Service/WindowsAzure/Storage.php b/lib/Zend/Service/WindowsAzure/Storage.php
index 09be10af796..d486abd8d35 100644
--- a/lib/Zend/Service/WindowsAzure/Storage.php
+++ b/lib/Zend/Service/WindowsAzure/Storage.php
@@ -53,14 +53,14 @@ class Zend_Service_WindowsAzure_Storage
 	const URL_DEV_BLOB      = "127.0.0.1:10000";
 	const URL_DEV_QUEUE     = "127.0.0.1:10001";
 	const URL_DEV_TABLE     = "127.0.0.1:10002";
-	
+
 	/**
 	 * Live storage URLS
 	 */
 	const URL_CLOUD_BLOB    = "blob.core.windows.net";
 	const URL_CLOUD_QUEUE   = "queue.core.windows.net";
 	const URL_CLOUD_TABLE   = "table.core.windows.net";
-	
+
 	/**
 	 * Resource types
 	 */
@@ -70,98 +70,98 @@ class Zend_Service_WindowsAzure_Storage
 	const RESOURCE_TABLE       = "t";
 	const RESOURCE_ENTITY      = "e";
 	const RESOURCE_QUEUE       = "q";
-	
+
 	/**
 	 * HTTP header prefixes
 	 */
 	const PREFIX_PROPERTIES      = "x-ms-prop-";
 	const PREFIX_METADATA        = "x-ms-meta-";
 	const PREFIX_STORAGE_HEADER  = "x-ms-";
-	
+
 	/**
 	 * Current API version
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_apiVersion = '2009-09-19';
-	
+
 	/**
 	 * Storage host name
 	 *
 	 * @var string
 	 */
 	protected $_host = '';
-	
+
 	/**
 	 * Account name for Windows Azure
 	 *
 	 * @var string
 	 */
 	protected $_accountName = '';
-	
+
 	/**
 	 * Account key for Windows Azure
 	 *
 	 * @var string
 	 */
 	protected $_accountKey = '';
-	
+
 	/**
 	 * Use path-style URI's
 	 *
 	 * @var boolean
 	 */
 	protected $_usePathStyleUri = false;
-	
+
 	/**
 	 * Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
 	 *
 	 * @var Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 	 */
 	protected $_credentials = null;
-	
+
 	/**
 	 * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance
-	 * 
+	 *
 	 * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
 	 */
 	protected $_retryPolicy = null;
-	
+
 	/**
 	 * Zend_Http_Client channel used for communication with REST services
-	 * 
+	 *
 	 * @var Zend_Http_Client
 	 */
 	protected $_httpClientChannel = null;
-	
+
 	/**
 	 * Use proxy?
-	 * 
+	 *
 	 * @var boolean
 	 */
 	protected $_useProxy = false;
-	
+
 	/**
 	 * Proxy url
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_proxyUrl = '';
-	
+
 	/**
 	 * Proxy port
-	 * 
+	 *
 	 * @var int
 	 */
 	protected $_proxyPort = 80;
-	
+
 	/**
 	 * Proxy credentials
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_proxyCredentials = '';
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Storage instance
 	 *
@@ -182,7 +182,7 @@ public function __construct(
 		$this->_accountName = $accountName;
 		$this->_accountKey = $accountKey;
 		$this->_usePathStyleUri = $usePathStyleUri;
-		
+
 		// Using local storage?
 		if (!$this->_usePathStyleUri
 			&& ($this->_host == self::URL_DEV_BLOB
@@ -192,17 +192,17 @@ public function __construct(
 			// Local storage
 			$this->_usePathStyleUri = true;
 		}
-		
+
 		if (is_null($this->_credentials)) {
 		    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKey(
 		    	$this->_accountName, $this->_accountKey, $this->_usePathStyleUri);
 		}
-		
+
 		$this->_retryPolicy = $retryPolicy;
 		if (is_null($this->_retryPolicy)) {
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
-		
+
 		// Setup default Zend_Http_Client channel
 		$options = array(
 			'adapter' => 'Zend_Http_Client_Adapter_Proxy'
@@ -216,27 +216,27 @@ public function __construct(
 		}
 		$this->_httpClientChannel = new Zend_Http_Client(null, $options);
 	}
-	
+
 	/**
 	 * Set the HTTP client channel to use
-	 * 
+	 *
 	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
 	 */
 	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Proxy')
 	{
 		$this->_httpClientChannel->setAdapter($adapterInstance);
 	}
-	
+
     /**
      * Retrieve HTTP client channel
-     * 
+     *
      * @return Zend_Http_Client_Adapter_Interface
      */
     public function getHttpClientChannel()
     {
         return $this->_httpClientChannel;
     }
-	
+
 	/**
 	 * Set retry policy to use when making requests
 	 *
@@ -249,10 +249,10 @@ public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicy
 		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
 		}
 	}
-	
+
 	/**
 	 * Set proxy
-	 * 
+	 *
 	 * @param boolean $useProxy         Use proxy?
 	 * @param string  $proxyUrl         Proxy URL
 	 * @param int     $proxyPort        Proxy port
@@ -264,10 +264,10 @@ public function setProxy($useProxy = false, $proxyUrl = '', $proxyPort = 80, $pr
 	    $this->_proxyUrl         = $proxyUrl;
 	    $this->_proxyPort        = $proxyPort;
 	    $this->_proxyCredentials = $proxyCredentials;
-	    
+
 	    if ($this->_useProxy) {
 	    	$credentials = explode(':', $this->_proxyCredentials);
-	    	
+
 	    	$this->_httpClientChannel->setConfig(array(
 				'proxy_host' => $this->_proxyUrl,
 	    		'proxy_port' => $this->_proxyPort,
@@ -283,17 +283,17 @@ public function setProxy($useProxy = false, $proxyUrl = '', $proxyPort = 80, $pr
 	    	));
 	    }
 	}
-	
+
 	/**
 	 * Returns the Windows Azure account name
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getAccountName()
 	{
 		return $this->_accountName;
 	}
-	
+
 	/**
 	 * Get base URL for creating requests
 	 *
@@ -307,10 +307,10 @@ public function getBaseUrl()
 			return 'http://' . $this->_accountName . '.' . $this->_host;
 		}
 	}
-	
+
 	/**
 	 * Set Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 * 
+	 *
 	 * @param Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance to use for request signing.
 	 */
 	public function setCredentials(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials)
@@ -320,17 +320,17 @@ public function setCredentials(Zend_Service_WindowsAzure_Credentials_Credentials
 	    $this->_credentials->setAccountkey($this->_accountKey);
 	    $this->_credentials->setUsePathStyleUri($this->_usePathStyleUri);
 	}
-	
+
 	/**
 	 * Get Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 * 
+	 *
 	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
 	 */
 	public function getCredentials()
 	{
 	    return $this->_credentials;
 	}
-	
+
 	/**
 	 * Perform request using Zend_Http_Client channel
 	 *
@@ -358,12 +358,12 @@ protected function _performRequest(
 		if (strpos($path, '/') !== 0) {
 			$path = '/' . $path;
 		}
-			
+
 		// Clean headers
 		if (is_null($headers)) {
 		    $headers = array();
 		}
-		
+
 		// Ensure cUrl will also work correctly:
 		//  - disable Content-Type if required
 		//  - disable Expect: 100 Continue
@@ -374,7 +374,7 @@ protected function _performRequest(
 
 		// Add version header
 		$headers['x-ms-version'] = $this->_apiVersion;
-		    
+
 		// URL encoding
 		$path           = self::urlencode($path);
 		$queryString    = self::urlencode($queryString);
@@ -385,22 +385,22 @@ protected function _performRequest(
 		$requestHeaders = $this->_credentials
 						  ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission, $rawData);
 
-		// Prepare request 
+		// Prepare request
 		$this->_httpClientChannel->resetParameters(true);
 		$this->_httpClientChannel->setUri($requestUrl);
 		$this->_httpClientChannel->setHeaders($requestHeaders);
 		$this->_httpClientChannel->setRawData($rawData);
-				
+
 		// Execute request
 		$response = $this->_retryPolicy->execute(
 		    array($this->_httpClientChannel, 'request'),
 		    array($httpVerb)
 		);
-		
+
 		return $response;
 	}
-	
-	/** 
+
+	/**
 	 * Parse result from Zend_Http_Response
 	 *
 	 * @param Zend_Http_Response $response Response from HTTP call
@@ -413,27 +413,27 @@ protected function _parseResponse(Zend_Http_Response $response = null)
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
 		}
-		
+
         $xml = Zend_Xml_Security::scan($response->getBody());
-        
+
         if ($xml !== false) {
-            // Fetch all namespaces 
-            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); 
-            
+            // Fetch all namespaces
+            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true));
+
             // Register all namespace prefixes
-            foreach ($namespaces as $prefix => $ns) { 
+            foreach ($namespaces as $prefix => $ns) {
                 if ($prefix != '') {
                     $xml->registerXPathNamespace($prefix, $ns);
-                } 
-            } 
+                }
+            }
         }
-        
+
         return $xml;
 	}
-	
+
 	/**
 	 * Generate metadata headers
-	 * 
+	 *
 	 * @param array $metadata
 	 * @return HTTP headers containing metadata
 	 */
@@ -443,7 +443,7 @@ protected function _generateMetadataHeaders($metadata = array())
 		if (!is_array($metadata)) {
 			return array();
 		}
-		
+
 		// Return headers
 		$headers = array();
 		foreach ($metadata as $key => $value) {
@@ -451,20 +451,20 @@ protected function _generateMetadataHeaders($metadata = array())
                             #require_once 'Zend/Service/WindowsAzure/Exception.php';
                             throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.');
 			}
-			
+
 			if (!self::isValidMetadataName($key)) {
                             #require_once 'Zend/Service/WindowsAzure/Exception.php';
                             throw new Zend_Service_WindowsAzure_Exception('Metadata name does not adhere to metadata naming conventions. See http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx for more information.');
 			}
-			
+
 		    $headers["x-ms-meta-" . strtolower($key)] = $value;
 		}
 		return $headers;
 	}
-	
+
 	/**
 	 * Parse metadata headers
-	 * 
+	 *
 	 * @param array $headers HTTP headers containing metadata
 	 * @return array
 	 */
@@ -474,7 +474,7 @@ protected function _parseMetadataHeaders($headers = array())
 		if (!is_array($headers)) {
 			return array();
 		}
-		
+
 		// Return metadata
 		$metadata = array();
 		foreach ($headers as $key => $value) {
@@ -484,10 +484,10 @@ protected function _parseMetadataHeaders($headers = array())
 		}
 		return $metadata;
 	}
-	
+
 	/**
 	 * Parse metadata XML
-	 * 
+	 *
 	 * @param SimpleXMLElement $parentElement Element containing the Metadata element.
 	 * @return array
 	 */
@@ -500,30 +500,30 @@ protected function _parseMetadataElement($element = null)
 
 		return array();
 	}
-	
+
 	/**
 	 * Generate ISO 8601 compliant date string in UTC time zone
-	 * 
+	 *
 	 * @param int $timestamp
 	 * @return string
 	 */
-	public function isoDate($timestamp = null) 
-	{        
+	public function isoDate($timestamp = null)
+	{
 	    $tz = @date_default_timezone_get();
 	    @date_default_timezone_set('UTC');
-	    
+
 	    if (is_null($timestamp)) {
 	        $timestamp = time();
 	    }
-	        
+
 	    $returnValue = str_replace('+00:00', '.0000000Z', @date('c', $timestamp));
 	    @date_default_timezone_set($tz);
 	    return $returnValue;
 	}
-	
+
 	/**
 	 * URL encode function
-	 * 
+	 *
 	 * @param  string $value Value to encode
 	 * @return string        Encoded value
 	 */
@@ -531,7 +531,7 @@ public static function urlencode($value)
 	{
 	    return str_replace(' ', '%20', $value);
 	}
-	
+
 	/**
 	 * Is valid metadata name?
 	 *
@@ -543,22 +543,22 @@ public static function isValidMetadataName($metadataName = '')
         if (preg_match("/^[a-zA-Z0-9_@][a-zA-Z0-9_]*$/", $metadataName) === 0) {
             return false;
         }
-    
+
         if ($metadataName == '') {
             return false;
         }
 
         return true;
     }
-    
+
     /**
      * Builds a query string from an array of elements
-     * 
+     *
      * @param array     Array of elements
      * @return string   Assembled query string
      */
     public static function createQueryStringFromArray($queryString)
     {
     	return count($queryString) > 0 ? '?' . implode('&', $queryString) : '';
-    }	
+    }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Storage/Batch.php b/lib/Zend/Service/WindowsAzure/Storage/Batch.php
index 01d9d492e97..47f5df4bc4b 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/Batch.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/Batch.php
@@ -29,45 +29,45 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_WindowsAzure_Storage_Batch
-{	
+{
     /**
      * Storage client the batch is defined on
-     * 
+     *
      * @var Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
      */
     protected $_storageClient = null;
-    
+
     /**
      * For table storage?
-     * 
+     *
      * @var boolean
      */
     protected $_forTableStorage = false;
-    
+
     /**
      * Base URL
-     * 
+     *
      * @var string
      */
     protected $_baseUrl;
-    
+
     /**
      * Pending operations
-     * 
+     *
      * @var unknown_type
      */
     protected $_operations = array();
-    
+
     /**
      * Does the batch contain a single select?
-     * 
+     *
      * @var boolean
      */
     protected $_isSingleSelect = false;
-    
+
     /**
      * Creates a new Zend_Service_WindowsAzure_Storage_Batch
-     * 
+     *
      * @param Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient Storage client the batch is defined on
      */
     public function __construct(Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient = null, $baseUrl = '')
@@ -76,7 +76,7 @@ public function __construct(Zend_Service_WindowsAzure_Storage_BatchStorageAbstra
         $this->_baseUrl       = $baseUrl;
         $this->_beginBatch();
     }
-    
+
 	/**
 	 * Get base URL for creating requests
 	 *
@@ -86,17 +86,17 @@ public function getBaseUrl()
 	{
 		return $this->_baseUrl;
 	}
-    
+
     /**
      * Starts a new batch operation set
-     * 
+     *
      * @throws Zend_Service_WindowsAzure_Exception
      */
     protected function _beginBatch()
     {
         $this->_storageClient->setCurrentBatch($this);
     }
-    
+
     /**
      * Cleanup current batch
      */
@@ -125,7 +125,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend
 	    if ($forTableStorage) {
 	        $this->_forTableStorage = true;
 	    }
-	    
+
 	    // Set _isSingleSelect
 	    if ($httpVerb == Zend_Http_Client::GET) {
 	        if (count($this->_operations) > 0) {
@@ -134,29 +134,29 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend
 	        }
 	        $this->_isSingleSelect = true;
 	    }
-	    
+
 	    // Clean path
 		if (strpos($path, '/') !== 0) {
 			$path = '/' . $path;
 		}
-			
+
 		// Clean headers
 		if (is_null($headers)) {
 		    $headers = array();
 		}
-		    
+
 		// URL encoding
 		$path           = Zend_Service_WindowsAzure_Storage::urlencode($path);
 		$queryString    = Zend_Service_WindowsAzure_Storage::urlencode($queryString);
 
 		// Generate URL
 		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
-		
+
 		// Generate $rawData
 		if (is_null($rawData)) {
 		    $rawData = '';
 		}
-		    
+
 		// Add headers
 		if ($httpVerb != Zend_Http_Client::GET) {
     		$headers['Content-ID'] = count($this->_operations) + 1;
@@ -165,7 +165,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend
     		}
     		$headers['Content-Length'] = strlen($rawData);
 		}
-		    
+
 		// Generate $operation
 		$operation = '';
 		$operation .= $httpVerb . ' ' . $requestUrl . ' HTTP/1.1' . "\n";
@@ -174,42 +174,42 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend
 		    $operation .= $key . ': ' . $value . "\n";
 		}
 		$operation .= "\n";
-		
+
 		// Add data
 		$operation .= $rawData;
 
 		// Store operation
-		$this->_operations[] = $operation;	        
+		$this->_operations[] = $operation;
 	}
-    
+
     /**
      * Commit current batch
-     * 
+     *
      * @return Zend_Http_Response
      * @throws Zend_Service_WindowsAzure_Exception
      */
     public function commit()
-    {    	
+    {
         // Perform batch
         $response = $this->_storageClient->performBatch($this->_operations, $this->_forTableStorage, $this->_isSingleSelect);
-        
+
         // Dispose
         $this->_clean();
-        
+
         // Parse response
         $errors = null;
         preg_match_all('/<message (.*)>(.*)<\/message>/', $response->getBody(), $errors);
-        
+
         // Error?
         if (count($errors[2]) > 0) {
             #require_once 'Zend/Service/WindowsAzure/Exception.php';
             throw new Zend_Service_WindowsAzure_Exception('An error has occured while committing a batch: ' . $errors[2][0]);
         }
-        
+
         // Return
         return $response;
     }
-    
+
     /**
      * Rollback current batch
      */
@@ -218,20 +218,20 @@ public function rollback()
         // Dispose
         $this->_clean();
     }
-    
+
     /**
      * Get operation count
-     * 
+     *
      * @return integer
      */
     public function getOperationCount()
     {
         return count($this->_operations);
     }
-    
+
     /**
      * Is single select?
-     * 
+     *
      * @return boolean
      */
     public function isSingleSelect()
diff --git a/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php b/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
index 101bc5140b9..a849b736dbf 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
@@ -34,17 +34,17 @@
  */
 abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
     extends Zend_Service_WindowsAzure_Storage
-{	
+{
     /**
      * Current batch
-     * 
+     *
      * @var Zend_Service_WindowsAzure_Storage_Batch
      */
     protected $_currentBatch = null;
-    
+
     /**
      * Set current batch
-     * 
+     *
      * @param Zend_Service_WindowsAzure_Storage_Batch $batch Current batch
      * @throws Zend_Service_WindowsAzure_Exception
      */
@@ -56,30 +56,30 @@ public function setCurrentBatch(Zend_Service_WindowsAzure_Storage_Batch $batch =
         }
         $this->_currentBatch = $batch;
     }
-    
+
     /**
      * Get current batch
-     * 
+     *
      * @return Zend_Service_WindowsAzure_Storage_Batch
      */
     public function getCurrentBatch()
     {
         return $this->_currentBatch;
     }
-    
+
     /**
      * Is there a current batch?
-     * 
+     *
      * @return boolean
      */
     public function isInBatch()
     {
         return !is_null($this->_currentBatch);
     }
-    
+
     /**
      * Starts a new batch operation set
-     * 
+     *
      * @return Zend_Service_WindowsAzure_Storage_Batch
      * @throws Zend_Service_WindowsAzure_Exception
      */
@@ -88,7 +88,7 @@ public function startBatch()
 		#require_once 'Zend/Service/WindowsAzure/Storage/Batch.php';
         return new Zend_Service_WindowsAzure_Storage_Batch($this, $this->getBaseUrl());
     }
-	
+
 	/**
 	 * Perform batch using Zend_Http_Client channel, combining all batch operations into one request
 	 *
@@ -104,42 +104,42 @@ public function performBatch($operations = array(), $forTableStorage = false, $i
 	    // Generate boundaries
 	    $batchBoundary = 'batch_' . md5(time() . microtime());
 	    $changesetBoundary = 'changeset_' . md5(time() . microtime());
-	    
+
 	    // Set headers
 	    $headers = array();
-	    
+
 		// Add version header
 		$headers['x-ms-version'] = $this->_apiVersion;
-		
+
 		// Add dataservice headers
 		$headers['DataServiceVersion'] = '1.0;NetFx';
 		$headers['MaxDataServiceVersion'] = '1.0;NetFx';
-		
+
 		// Add content-type header
 		$headers['Content-Type'] = 'multipart/mixed; boundary=' . $batchBoundary;
 
 		// Set path and query string
 		$path           = '/$batch';
 		$queryString    = '';
-		
+
 		// Set verb
 		$httpVerb = Zend_Http_Client::POST;
-		
+
 		// Generate raw data
     	$rawData = '';
-    		
+
 		// Single select?
 		if ($isSingleSelect) {
 		    $operation = $operations[0];
 		    $rawData .= '--' . $batchBoundary . "\n";
             $rawData .= 'Content-Type: application/http' . "\n";
             $rawData .= 'Content-Transfer-Encoding: binary' . "\n\n";
-            $rawData .= $operation; 
+            $rawData .= $operation;
             $rawData .= '--' . $batchBoundary . '--';
 		} else {
     		$rawData .= '--' . $batchBoundary . "\n";
     		$rawData .= 'Content-Type: multipart/mixed; boundary=' . $changesetBoundary . "\n\n";
-    		
+
         		// Add operations
         		foreach ($operations as $operation)
         		{
@@ -149,7 +149,7 @@ public function performBatch($operations = array(), $forTableStorage = false, $i
                 	$rawData .= $operation;
         		}
         		$rawData .= '--' . $changesetBoundary . '--' . "\n";
-    		    		    
+
     		$rawData .= '--' . $batchBoundary . '--';
 		}
 
@@ -162,7 +162,7 @@ public function performBatch($operations = array(), $forTableStorage = false, $i
 		$this->_httpClientChannel->setUri($requestUrl);
 		$this->_httpClientChannel->setHeaders($requestHeaders);
 		$this->_httpClientChannel->setRawData($rawData);
-		
+
 		// Execute request
 		$response = $this->_retryPolicy->execute(
 		    array($this->_httpClientChannel, 'request'),
diff --git a/lib/Zend/Service/WindowsAzure/Storage/Blob.php b/lib/Zend/Service/WindowsAzure/Storage/Blob.php
index 07b90bf17b8..ae867e8619c 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/Blob.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/Blob.php
@@ -74,7 +74,7 @@ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_S
 	 * @deprecated Use ACL_PUBLIC_CONTAINER or ACL_PUBLIC_BLOB instead.
 	 */
 	const ACL_PUBLIC = 'container';
-	
+
 	/**
 	 * ACL - Blob Public access (read all blobs)
 	 */
@@ -198,7 +198,7 @@ public function containerExists($containerName = '')
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
 		}
-			
+
 		// List containers
 		$containers = $this->listContainers($containerName, 1);
 		foreach ($containers as $container) {
@@ -232,7 +232,7 @@ public function createContainer($containerName = '', $metadata = array())
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.');
 		}
-			
+
 		// Create metadata headers
 		$headers = array();
 		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
@@ -240,7 +240,7 @@ public function createContainer($containerName = '', $metadata = array())
 		// Perform request
 		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
 		if ($response->isSuccessful()) {
-			
+
 			return new Zend_Service_WindowsAzure_Storage_BlobContainer(
 			$containerName,
 			$response->getHeader('Etag'),
@@ -252,7 +252,7 @@ public function createContainer($containerName = '', $metadata = array())
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Create container if it does not exist
 	 *
@@ -510,7 +510,7 @@ public function deleteContainer($containerName = '', $additionalHeaders = array(
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
 		}
-			
+
 		// Additional headers?
 		$headers = array();
 		foreach ($additionalHeaders as $key => $value) {
@@ -553,7 +553,7 @@ public function listContainers($prefix = null, $maxResults = null, $marker = nul
 			$queryString[] = 'include=' . $include;
 		}
 		$queryString = self::createQueryStringFromArray($queryString);
-		 
+
 		// Perform request
 		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_LIST);
 		if ($response->isSuccessful()) {
@@ -563,7 +563,7 @@ public function listContainers($prefix = null, $maxResults = null, $marker = nul
 			$containers = array();
 			if (!is_null($xmlContainers)) {
 				for ($i = 0; $i < count($xmlContainers); $i++) {
-					
+
 					$containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer(
 					(string)$xmlContainers[$i]->Name,
 					(string)$xmlContainers[$i]->Etag,
@@ -581,7 +581,7 @@ public function listContainers($prefix = null, $maxResults = null, $marker = nul
 			if (!is_null($maxResults) && count($containers) > $maxResults) {
 				$containers = array_slice($containers, 0, $maxResults);
 			}
-			 
+
 			return $containers;
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
@@ -627,7 +627,7 @@ public function putBlob($containerName = '', $blobName = '', $localFileName = ''
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
 		}
-			
+
 		// Check file size
 		if (filesize($localFileName) >= self::MAX_BLOB_SIZE) {
 			return $this->putLargeBlob($containerName, $blobName, $localFileName, $metadata, $leaseId, $additionalHeaders);
@@ -689,7 +689,7 @@ public function putBlobData($containerName = '', $blobName = '', $data = '', $me
 		// Perform request
 		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, $data, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
 		if ($response->isSuccessful()) {
-			
+
 			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
 			$containerName,
 			$blobName,
@@ -748,12 +748,12 @@ public function putLargeBlob($containerName = '', $blobName = '', $localFileName
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
 		}
-			
+
 		// Check file size
 		if (filesize($localFileName) < self::MAX_BLOB_SIZE) {
 			return $this->putBlob($containerName, $blobName, $localFileName, $metadata, $leaseId, $additionalHeaders);
 		}
-			
+
 		// Determine number of parts
 		$numberOfParts = ceil( filesize($localFileName) / self::MAX_BLOB_TRANSFER_SIZE );
 
@@ -769,18 +769,18 @@ public function putLargeBlob($containerName = '', $blobName = '', $localFileName
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Could not open local file.');
 		}
-			
+
 		// Upload parts
 		for ($i = 0; $i < $numberOfParts; $i++) {
 			// Seek position in file
 			fseek($fp, $i * self::MAX_BLOB_TRANSFER_SIZE);
-				
+
 			// Read contents
 			$fileContents = fread($fp, self::MAX_BLOB_TRANSFER_SIZE);
-				
+
 			// Put block
 			$this->putBlock($containerName, $blobName, $blockIdentifiers[$i], $fileContents, $leaseId);
-				
+
 			// Dispose file contents
 			$fileContents = null;
 			unset($fileContents);
@@ -795,7 +795,7 @@ public function putLargeBlob($containerName = '', $blobName = '', $localFileName
 		// Return information of the blob
 		return $this->getBlobInstance($containerName, $blobName, null, $leaseId);
 	}
-		
+
 	/**
 	 * Put large blob block
 	 *
@@ -834,7 +834,7 @@ public function putBlock($containerName = '', $blobName = '', $identifier = '',
 		if (!is_null($leaseId)) {
 			$headers['x-ms-lease-id'] = $leaseId;
 		}
-			
+
 		// Resource name
 		$resourceName = self::createResourceName($containerName , $blobName);
 
@@ -971,7 +971,7 @@ public function getBlockList($containerName = '', $blobName = '', $snapshotId =
 
 		// Resource name
 		$resourceName = self::createResourceName($containerName , $blobName);
-			
+
 		// Perform request
 		$response = $this->_performRequest($resourceName, $queryString, Zend_Http_Client::GET, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
 		if ($response->isSuccessful()) {
@@ -1062,7 +1062,7 @@ public function createPageBlob($containerName = '', $blobName = '', $size = 0, $
 		// Perform request
 		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, '', Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
 		if ($response->isSuccessful()) {
-			
+
 			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
 			$containerName,
 			$blobName,
@@ -1220,24 +1220,24 @@ public function getPageRegions($containerName = '', $blobName = '', $startByteOf
 			} else {
 				$xmlRanges = array($result->PageRange);
 			}
-			
-			
+
+
 			$ranges = array();
-			
+
 			for ($i = 0; $i < count($xmlRanges); $i++) {
 				$ranges[] = new Zend_Service_WindowsAzure_Storage_PageRegionInstance(
 				(int)$xmlRanges[$i]->Start,
 				(int)$xmlRanges[$i]->End
 				);
 			}
-			 
+
 			return $ranges;
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-		
+
 	/**
 	 * Copy blob
 	 *
@@ -1312,7 +1312,7 @@ public function copyBlob($sourceContainerName = '', $sourceBlobName = '', $desti
 		// Perform request
 		$response = $this->_performRequest($destinationResourceName, '', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
 		if ($response->isSuccessful()) {
-			
+
 			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
 			$destinationContainerName,
 			$destinationBlobName,
@@ -1458,7 +1458,7 @@ public function getBlobInstance($containerName = '', $blobName = '', $snapshotId
 			$queryString[] = 'snapshot=' . $snapshotId;
 		}
 		$queryString = self::createQueryStringFromArray($queryString);
-		 
+
 		// Additional headers?
 		$headers = array();
 		if (!is_null($leaseId)) {
@@ -1476,7 +1476,7 @@ public function getBlobInstance($containerName = '', $blobName = '', $snapshotId
 		if ($response->isSuccessful()) {
 			// Parse metadata
 			$metadata = $this->_parseMetadataHeaders($response->getHeaders());
-			
+
 			// Return blob
 			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
 				$containerName,
@@ -1709,7 +1709,7 @@ public function deleteBlob($containerName = '', $blobName = '', $snapshotId = nu
 			$queryString[] = 'snapshot=' . $snapshotId;
 		}
 		$queryString = self::createQueryStringFromArray($queryString);
-			
+
 		// Additional headers?
 		$headers = array();
 		if (!is_null($leaseId)) {
@@ -1819,9 +1819,9 @@ public function leaseBlob($containerName = '', $blobName = '', $leaseAction = se
 
 		// Perform request
 		$response = $this->_performRequest($resourceName, '?comp=lease', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		
-		
-		
+
+
+
 		if ($response->isSuccessful()) {
 			return new Zend_Service_WindowsAzure_Storage_LeaseInstance(
 			$containerName,
@@ -1857,7 +1857,7 @@ public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $m
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
 		}
-			
+
 		// Build query string
 		$queryString = array('restype=container', 'comp=list');
 		if (!is_null($prefix)) {
@@ -1882,14 +1882,14 @@ public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $m
 		if ($response->isSuccessful()) {
 			// Return value
 			$blobs = array();
-	
+
 			// Blobs
 			$xmlBlobs = $this->_parseResponse($response)->Blobs->Blob;
 			if (!is_null($xmlBlobs)) {
-				
+
 				for ($i = 0; $i < count($xmlBlobs); $i++) {
 					$properties = (array)$xmlBlobs[$i]->Properties;
-						
+
 					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
 					$containerName,
 					(string)$xmlBlobs[$i]->Name,
@@ -1909,12 +1909,12 @@ public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $m
 					);
 				}
 			}
-				
+
 			// Blob prefixes (folders)
 			$xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix;
-				
+
 			if (!is_null($xmlBlobs)) {
-				
+
 				for ($i = 0; $i < count($xmlBlobs); $i++) {
 					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
 					$containerName,
@@ -1935,7 +1935,7 @@ public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $m
 					);
 				}
 			}
-				
+
 			// More blobs?
 			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
 			$currentResultCount = $currentResultCount + count($blobs);
@@ -1947,7 +1947,7 @@ public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $m
 			if (!is_null($maxResults) && count($blobs) > $maxResults) {
 				$blobs = array_slice($blobs, 0, $maxResults);
 			}
-				
+
 			return $blobs;
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
diff --git a/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php b/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
index 7083ef08dbd..cef6e863c4c 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
@@ -31,49 +31,49 @@ class Zend_Service_WindowsAzure_Storage_Blob_Stream
 {
     /**
      * Current file name
-     * 
+     *
      * @var string
      */
     protected $_fileName = null;
-    
+
     /**
      * Temporary file name
-     * 
+     *
      * @var string
      */
     protected $_temporaryFileName = null;
-    
+
     /**
      * Temporary file handle
-     * 
+     *
      * @var resource
      */
     protected $_temporaryFileHandle = null;
-    
+
     /**
      * Blob storage client
-     * 
+     *
      * @var Zend_Service_WindowsAzure_Storage_Blob
      */
     protected $_storageClient = null;
-    
+
     /**
      * Write mode?
-     * 
+     *
      * @var boolean
      */
     protected $_writeMode = false;
-    
+
     /**
      * List of blobs
-     * 
+     *
      * @var array
      */
     protected $_blobs = null;
-    
+
     /**
      * Retrieve storage client for this stream type
-     * 
+     *
      * @param string $path
      * @return Zend_Service_WindowsAzure_Storage_Blob
      */
@@ -90,10 +90,10 @@ protected function _getStorageClient($path = '')
                 throw new Zend_Service_WindowsAzure_Exception('No storage client registered for stream type "' . $url[0] . '://".');
             }
         }
-        
+
         return $this->_storageClient;
     }
-    
+
     /**
      * Extract container name
      *
@@ -109,7 +109,7 @@ protected function _getContainerName($path)
 
         return '';
     }
-    
+
     /**
      * Extract file name
      *
@@ -129,7 +129,7 @@ protected function _getFileName($path)
 
         return '';
     }
-       
+
     /**
      * Open the stream
      *
@@ -143,21 +143,21 @@ public function stream_open($path, $mode, $options, &$opened_path)
     {
         $this->_fileName = $path;
         $this->_temporaryFileName = tempnam(sys_get_temp_dir(), 'azure');
-        
+
         // Check the file can be opened
         $fh = @fopen($this->_temporaryFileName, $mode);
         if ($fh === false) {
             return false;
         }
         fclose($fh);
-        
+
         // Write mode?
         if (strpbrk($mode, 'wax+')) {
             $this->_writeMode = true;
     	} else {
             $this->_writeMode = false;
         }
-        
+
         // If read/append, fetch the file
         if (!$this->_writeMode || strpbrk($mode, 'ra+')) {
             $this->_getStorageClient($this->_fileName)->getBlob(
@@ -166,10 +166,10 @@ public function stream_open($path, $mode, $options, &$opened_path)
                 $this->_temporaryFileName
             );
         }
-        
+
         // Open temporary file handle
         $this->_temporaryFileHandle = fopen($this->_temporaryFileName, $mode);
-        
+
         // Ok!
         return true;
     }
@@ -182,7 +182,7 @@ public function stream_open($path, $mode, $options, &$opened_path)
     public function stream_close()
     {
         @fclose($this->_temporaryFileHandle);
-        
+
         // Upload the file?
         if ($this->_writeMode) {
             // Make sure the container exists
@@ -194,7 +194,7 @@ public function stream_close()
                     $this->_getContainerName($this->_fileName)
                 );
             }
-            
+
             // Upload the file
             try {
                 $this->_getStorageClient($this->_fileName)->putBlob(
@@ -205,11 +205,11 @@ public function stream_close()
             } catch (Zend_Service_WindowsAzure_Exception $ex) {
                 @unlink($this->_temporaryFileName);
                 unset($this->_storageClient);
-                
+
                 throw $ex;
             }
         }
-        
+
         @unlink($this->_temporaryFileName);
         unset($this->_storageClient);
     }
@@ -240,7 +240,7 @@ public function stream_write($data)
         if (!$this->_temporaryFileHandle) {
             return 0;
         }
-        
+
         $len = strlen($data);
         fwrite($this->_temporaryFileHandle, $data, $len);
         return $len;
@@ -282,7 +282,7 @@ public function stream_seek($offset, $whence)
         if (!$this->_temporaryFileHandle) {
             return false;
         }
-        
+
         return (fseek($this->_temporaryFileHandle, $offset, $whence) === 0);
     }
 
@@ -294,7 +294,7 @@ public function stream_seek($offset, $whence)
     public function stream_flush()
     {
         $result = fflush($this->_temporaryFileHandle);
-        
+
          // Upload the file?
         if ($this->_writeMode) {
             // Make sure the container exists
@@ -306,7 +306,7 @@ public function stream_flush()
                     $this->_getContainerName($this->_fileName)
                 );
             }
-            
+
             // Upload the file
             try {
                 $this->_getStorageClient($this->_fileName)->putBlob(
@@ -317,11 +317,11 @@ public function stream_flush()
             } catch (Zend_Service_WindowsAzure_Exception $ex) {
                 @unlink($this->_temporaryFileName);
                 unset($this->_storageClient);
-                
+
                 throw $ex;
             }
         }
-        
+
         return $result;
     }
 
@@ -369,11 +369,11 @@ public function rename($path_from, $path_to)
         if ($this->_getContainerName($path_from) != $this->_getContainerName($path_to)) {
             throw new Zend_Service_WindowsAzure_Exception('Container name can not be changed.');
         }
-        
+
         if ($this->_getFileName($path_from) == $this->_getContainerName($path_to)) {
             return true;
         }
-            
+
         $this->_getStorageClient($path_from)->copyBlob(
             $this->_getContainerName($path_from),
             $this->_getFileName($path_from),
@@ -390,7 +390,7 @@ public function rename($path_from, $path_to)
         clearstatcache(true, $path_to);
         return true;
     }
-    
+
     /**
      * Return array of URL variables
      *
diff --git a/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php b/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php
index 1afd441a037..6b841803e5c 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php
@@ -27,7 +27,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Name          Name of the container
  * @property string $Etag          Etag of the container
  * @property string $LastModified  Last modified date of the container
@@ -37,20 +37,20 @@ class Zend_Service_WindowsAzure_Storage_BlobContainer
 {
     /**
      * Data
-     * 
+     *
      * @var array
      */
     protected $_data = null;
-    
+
     /**
      * Constructor
-     * 
+     *
      * @param string $name          Name
      * @param string $etag          Etag
      * @param string $lastModified  Last modified date
      * @param array  $metadata      Key/value pairs of meta data
      */
-    public function __construct($name, $etag, $lastModified, $metadata = array()) 
+    public function __construct($name, $etag, $lastModified, $metadata = array())
     {
         $this->_data = array(
             'name'         => $name,
@@ -59,10 +59,10 @@ public function __construct($name, $etag, $lastModified, $metadata = array())
             'metadata'     => $metadata
         );
     }
-    
+
     /**
      * Magic overload for setting properties
-     * 
+     *
      * @param string $name     Name of the property
      * @param string $value    Value to set
      */
@@ -77,7 +77,7 @@ public function __set($name, $value) {
 
     /**
      * Magic overload for getting properties
-     * 
+     *
      * @param string $name     Name of the property
      */
     public function __get($name) {
diff --git a/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php b/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php
index 356e53e1177..49d6dd29bfc 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string  $Container       The name of the blob container in which the blob is stored.
  * @property string  $Name            The name of the blob.
  * @property string  $SnapshotId      The blob snapshot ID if it is a snapshot blob (= a backup copy of a blob).
@@ -53,7 +53,7 @@ class Zend_Service_WindowsAzure_Storage_BlobInstance
 {
     /**
      * Constructor
-     * 
+     *
      * @param string  $containerName   Container name
      * @param string  $name            Name
      * @param string  $snapshotId      Snapshot id
@@ -70,8 +70,8 @@ class Zend_Service_WindowsAzure_Storage_BlobInstance
      * @param boolean $isPrefix        Is Prefix?
      * @param array   $metadata        Key/value pairs of meta data
      */
-    public function __construct($containerName, $name, $snapshotId, $etag, $lastModified, $url = '', $size = 0, $contentType = '', $contentEncoding = '', $contentLanguage = '', $cacheControl = '', $blobType = '', $leaseStatus = '', $isPrefix = false, $metadata = array()) 
-    {	        
+    public function __construct($containerName, $name, $snapshotId, $etag, $lastModified, $url = '', $size = 0, $contentType = '', $contentEncoding = '', $contentLanguage = '', $cacheControl = '', $blobType = '', $leaseStatus = '', $isPrefix = false, $metadata = array())
+    {
         $this->_data = array(
             'container'        => $containerName,
             'name'             => $name,
diff --git a/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php b/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
index 8dbf5d2a826..fb7faf86fca 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
@@ -33,36 +33,36 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_WindowsAzure_Storage_DynamicTableEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
-{   
+{
     /**
      * Dynamic properties
-     * 
+     *
      * @var array
      */
     protected $_dynamicProperties = array();
-    
+
     /**
      * Magic overload for setting properties
-     * 
+     *
      * @param string $name     Name of the property
      * @param string $value    Value to set
      */
-    public function __set($name, $value) {      
+    public function __set($name, $value) {
         $this->setAzureProperty($name, $value, null);
     }
 
     /**
      * Magic overload for getting properties
-     * 
+     *
      * @param string $name     Name of the property
      */
     public function __get($name) {
         return $this->getAzureProperty($name);
     }
-    
+
     /**
      * Set an Azure property
-     * 
+     *
      * @param string $name Property name
      * @param mixed $value Property value
      * @param string $type Property type (Edm.xxxx)
@@ -94,7 +94,7 @@ public function setAzureProperty($name, $value = '', $type = null)
                         $type = 'Edm.DateTime';
                     }
                 }
-                
+
                 // Set dynamic property
                 $this->_dynamicProperties[strtolower($name)] = (object)array(
                         'Name'  => $name,
@@ -102,11 +102,11 @@ public function setAzureProperty($name, $value = '', $type = null)
                     	'Value' => $value,
                     );
             }
-            
+
             // Set type?
             if (!is_null($type)) {
             	$this->_dynamicProperties[strtolower($name)]->Type = $type;
-            	
+
             	// Try to convert the type
             	if ($type == 'Edm.Int32' || $type == 'Edm.Int64') {
             		$value = intval($value);
@@ -122,16 +122,16 @@ public function setAzureProperty($name, $value = '', $type = null)
                     }
             	}
             }
-       
+
     		// Set value
             $this->_dynamicProperties[strtolower($name)]->Value = $value;
         }
         return $this;
     }
-    
+
     /**
      * Set an Azure property type
-     * 
+     *
      * @param string $name Property name
      * @param string $type Property type (Edm.xxxx)
      * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
@@ -139,16 +139,16 @@ public function setAzureProperty($name, $value = '', $type = null)
     public function setAzurePropertyType($name, $type = 'Edm.String')
     {
         if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name, '', $type);            
+            $this->setAzureProperty($name, '', $type);
         } else {
-            $this->_dynamicProperties[strtolower($name)]->Type = $type;   
+            $this->_dynamicProperties[strtolower($name)]->Type = $type;
         }
         return $this;
     }
-    
+
     /**
      * Get an Azure property
-     * 
+     *
      * @param string $name Property name
      * @param mixed $value Property value
      * @param string $type Property type (Edm.xxxx)
@@ -167,40 +167,40 @@ public function getAzureProperty($name)
         }
 
         if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name);            
+            $this->setAzureProperty($name);
         }
 
         return $this->_dynamicProperties[strtolower($name)]->Value;
     }
-    
+
     /**
      * Get an Azure property type
-     * 
+     *
      * @param string $name Property name
      * @return string Property type (Edm.xxxx)
      */
     public function getAzurePropertyType($name)
     {
         if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name, '', $type);            
+            $this->setAzureProperty($name, '', $type);
         }
-        
+
         return $this->_dynamicProperties[strtolower($name)]->Type;
     }
-    
+
     /**
      * Get Azure values
-     * 
+     *
      * @return array
      */
     public function getAzureValues()
     {
         return array_merge(array_values($this->_dynamicProperties), parent::getAzureValues());
     }
-    
+
     /**
      * Set Azure values
-     * 
+     *
      * @param array $values
      * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values?
      * @throws Zend_Service_WindowsAzure_Exception
@@ -209,9 +209,9 @@ public function setAzureValues($values = array(), $throwOnError = false)
     {
         // Set parent values
         parent::setAzureValues($values, false);
-        
+
         // Set current values
-        foreach ($values as $key => $value) 
+        foreach ($values as $key => $value)
         {
             $this->$key = $value;
         }
diff --git a/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php b/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php
index 11fa55aaa8e..322e66c8dbb 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/LeaseInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string  $Container       Container name
  * @property string  $Name            Name
  * @property string  $LeaseId         Lease id
@@ -42,14 +42,14 @@ class Zend_Service_WindowsAzure_Storage_LeaseInstance
 {
     /**
      * Constructor
-     * 
+     *
      * @param string  $containerName   Container name
      * @param string  $name            Name
      * @param string  $leaseId         Lease id
      * @param string  $leaseTime       Time remaining in the lease period, in seconds. This header is returned only for a successful request to break the lease. It provides an approximation as to when the lease period will expire.
      */
-    public function __construct($containerName, $name, $leaseId, $leaseTime) 
-    {	        
+    public function __construct($containerName, $name, $leaseId, $leaseTime)
+    {
         $this->_data = array(
             'container'        => $containerName,
             'name'             => $name,
diff --git a/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php b/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php
index 86a300770be..6c4a912a41d 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property int  $start   Page range start
  * @property int  $end     Page range end
  */
@@ -40,12 +40,12 @@ class Zend_Service_WindowsAzure_Storage_PageRegionInstance
 {
     /**
      * Constructor
-     * 
+     *
      * @param int  $start   Page range start
      * @param int  $end     Page range end
      */
-    public function __construct($start = 0, $end = 0) 
-    {	        
+    public function __construct($start = 0, $end = 0)
+    {
         $this->_data = array(
             'start'        => $start,
             'end'             => $end
diff --git a/lib/Zend/Service/WindowsAzure/Storage/Queue.php b/lib/Zend/Service/WindowsAzure/Storage/Queue.php
index 8ff13c4d7c0..3dbd0a98a6f 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/Queue.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/Queue.php
@@ -48,12 +48,12 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 	 * Maximal message size (in bytes)
 	 */
 	const MAX_MESSAGE_SIZE = 8388608;
-	
+
 	/**
 	 * Maximal message ttl (in seconds)
 	 */
 	const MAX_MESSAGE_TTL = 604800;
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Storage_Queue instance
 	 *
@@ -66,14 +66,14 @@ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_
 	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_QUEUE, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
 	{
 		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-		
+
 		// API version
 		$this->_apiVersion = '2009-09-19';
 	}
-	
+
 	/**
 	 * Check if a queue exists
-	 * 
+	 *
 	 * @param string $queueName Queue name
 	 * @return boolean
 	 */
@@ -87,7 +87,7 @@ public function queueExists($queueName = '')
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
 		}
-			
+
 		// List queues
         $queues = $this->listQueues($queueName, 1);
         foreach ($queues as $queue) {
@@ -95,10 +95,10 @@ public function queueExists($queueName = '')
                 return true;
             }
         }
-        
+
         return false;
 	}
-	
+
 	/**
 	 * Create queue
 	 *
@@ -117,15 +117,15 @@ public function createQueue($queueName = '', $metadata = array())
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
 		}
-			
+
 		// Create metadata headers
 		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
+		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
+
 		// Perform request
-		$response = $this->_performRequest($queueName, '', Zend_Http_Client::PUT, $headers);	
+		$response = $this->_performRequest($queueName, '', Zend_Http_Client::PUT, $headers);
 		if ($response->isSuccessful()) {
-			
+
 		    return new Zend_Service_WindowsAzure_Storage_QueueInstance(
 		        $queueName,
 		        $metadata
@@ -135,7 +135,7 @@ public function createQueue($queueName = '', $metadata = array())
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Create queue if it does not exist
 	 *
@@ -149,10 +149,10 @@ public function createQueueIfNotExists($queueName = '', $metadata = array())
 			$this->createQueue($queueName, $metadata);
 		}
 	}
-	
+
 	/**
 	 * Get queue
-	 * 
+	 *
 	 * @param string $queueName  Queue name
 	 * @return Zend_Service_WindowsAzure_Storage_QueueInstance
 	 * @throws Zend_Service_WindowsAzure_Exception
@@ -167,13 +167,13 @@ public function getQueue($queueName = '')
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
 		}
-		    
+
 		// Perform request
-		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::GET);	
+		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::GET);
 		if ($response->isSuccessful()) {
 		    // Parse metadata
 		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-			
+
 		    // Return queue
 		    $queue = new Zend_Service_WindowsAzure_Storage_QueueInstance(
 		        $queueName,
@@ -186,10 +186,10 @@ public function getQueue($queueName = '')
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Get queue metadata
-	 * 
+	 *
 	 * @param string $queueName  Queue name
 	 * @return array Key/value pairs of meta data
 	 * @throws Zend_Service_WindowsAzure_Exception
@@ -204,13 +204,13 @@ public function getQueueMetadata($queueName = '')
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
 		}
-			
+
 	    return $this->getQueue($queueName)->Metadata;
 	}
-	
+
 	/**
 	 * Set queue metadata
-	 * 
+	 *
 	 * Calling the Set Queue Metadata operation overwrites all existing metadata that is associated with the queue. It's not possible to modify an individual name/value pair.
 	 *
 	 * @param string $queueName  Queue name
@@ -230,11 +230,11 @@ public function setQueueMetadata($queueName = '', $metadata = array())
 		if (count($metadata) == 0) {
 		    return;
 		}
-		    
+
 		// Create metadata headers
 		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
+		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
+
 		// Perform request
 		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::PUT, $headers);
 
@@ -243,7 +243,7 @@ public function setQueueMetadata($queueName = '', $metadata = array())
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Delete queue
 	 *
@@ -260,7 +260,7 @@ public function deleteQueue($queueName = '')
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
 		}
-			
+
 		// Perform request
 		$response = $this->_performRequest($queueName, '', Zend_Http_Client::DELETE);
 		if (!$response->isSuccessful()) {
@@ -268,7 +268,7 @@ public function deleteQueue($queueName = '')
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * List queues
 	 *
@@ -297,16 +297,16 @@ public function listQueues($prefix = null, $maxResults = null, $marker = null, $
 	        $queryString[] = 'include=' . $include;
 	    }
 	    $queryString = self::createQueryStringFromArray($queryString);
-	        
+
 		// Perform request
-		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET);	
+		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET);
 		if ($response->isSuccessful()) {
 			$xmlQueues = $this->_parseResponse($response)->Queues->Queue;
 			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
 
 			$queues = array();
 			if (!is_null($xmlQueues)) {
-				
+
 				for ($i = 0; $i < count($xmlQueues); $i++) {
 					$queues[] = new Zend_Service_WindowsAzure_Storage_QueueInstance(
 						(string)$xmlQueues[$i]->Name,
@@ -323,14 +323,14 @@ public function listQueues($prefix = null, $maxResults = null, $marker = null, $
 			if (!is_null($maxResults) && count($queues) > $maxResults) {
 			    $queues = array_slice($queues, 0, $maxResults);
 			}
-			    
+
 			return $queues;
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Put message into queue
 	 *
@@ -361,20 +361,20 @@ public function putMessage($queueName = '', $message = '', $ttl = null)
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Message TTL is invalid. Maximal TTL is 7 days (' . self::MAX_MESSAGE_SIZE . ' seconds) and should be greater than zero.');
 		}
-		    
+
 	    // Build query string
 		$queryString = array();
         if (!is_null($ttl)) {
 	        $queryString[] = 'messagettl=' . $ttl;
         }
 	    $queryString = self::createQueryStringFromArray($queryString);
-	        
+
 	    // Build body
 	    $rawData = '';
 	    $rawData .= '<QueueMessage>';
 	    $rawData .= '    <MessageText>' . base64_encode($message) . '</MessageText>';
 	    $rawData .= '</QueueMessage>';
-	        
+
 		// Perform request
 		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::POST, array(), false, $rawData);
 
@@ -383,7 +383,7 @@ public function putMessage($queueName = '', $message = '', $ttl = null)
 			throw new Zend_Service_WindowsAzure_Exception('Error putting message into queue.');
 		}
 	}
-	
+
 	/**
 	 * Get queue messages
 	 *
@@ -412,7 +412,7 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Visibility timeout is invalid. Maximum value is 2 hours (7200 seconds) and should be greater than zero.');
 		}
-		    
+
 	    // Build query string
 		$queryString = array();
     	if ($peek) {
@@ -423,11 +423,11 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime
     	}
     	if (!$peek && !is_null($visibilityTimeout)) {
 	        $queryString[] = 'visibilitytimeout=' . $visibilityTimeout;
-    	}   
+    	}
 	    $queryString = self::createQueryStringFromArray($queryString);
-	        
+
 		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::GET);	
+		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::GET);
 		if ($response->isSuccessful()) {
 		    // Parse results
 			$result = $this->_parseResponse($response);
@@ -441,7 +441,7 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime
     		} else {
     		    $xmlMessages = array($result->QueueMessage);
     		}
-			
+
 			$messages = array();
 			for ($i = 0; $i < count($xmlMessages); $i++) {
 				$messages[] = new Zend_Service_WindowsAzure_Storage_QueueMessage(
@@ -454,14 +454,14 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime
 					base64_decode((string)$xmlMessages[$i]->MessageText)
 			    );
 			}
-			    
+
 			return $messages;
 		} else {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Peek queue messages
 	 *
@@ -474,7 +474,7 @@ public function peekMessages($queueName = '', $numOfMessages = 1)
 	{
 	    return $this->getMessages($queueName, $numOfMessages, null, true);
 	}
-	
+
 	/**
 	 * Checks to see if a given queue has messages
 	 *
@@ -486,7 +486,7 @@ public function hasMessages($queueName = '')
 	{
 		return count($this->peekMessages($queueName)) > 0;
 	}
-	
+
 	/**
 	 * Clear queue messages
 	 *
@@ -505,13 +505,13 @@ public function clearMessages($queueName = '')
 		}
 
 		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE);	
+		$response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE);
 		if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Error clearing messages from queue.');
 		}
 	}
-	
+
 	/**
 	 * Delete queue message
 	 *
@@ -535,13 +535,13 @@ public function deleteMessage($queueName, Zend_Service_WindowsAzure_Storage_Queu
 		}
 
 		// Perform request
-		$response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . urlencode($message->PopReceipt), Zend_Http_Client::DELETE);	
+		$response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . urlencode($message->PopReceipt), Zend_Http_Client::DELETE);
 		if (!$response->isSuccessful()) {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Is valid queue name?
 	 *
@@ -553,29 +553,29 @@ public static function isValidQueueName($queueName = '')
         if (preg_match("/^[a-z0-9][a-z0-9-]*$/", $queueName) === 0) {
             return false;
         }
-    
+
         if (strpos($queueName, '--') !== false) {
             return false;
         }
-    
+
         if (strtolower($queueName) != $queueName) {
             return false;
         }
-    
+
         if (strlen($queueName) < 3 || strlen($queueName) > 63) {
             return false;
         }
-            
+
         if (substr($queueName, -1) == '-') {
             return false;
         }
-    
+
         return true;
     }
-    
+
 	/**
 	 * Get error message from Zend_Http_Response
-	 * 
+	 *
 	 * @param Zend_Http_Response $response Repsonse
 	 * @param string $alternativeError Alternative error message
 	 * @return string
diff --git a/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php b/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php
index 4c972f1d6b2..115578fed45 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string  $Name                     Name of the queue
  * @property array   $Metadata                 Key/value pairs of meta data
  * @property integer $ApproximateMessageCount  The approximate number of messages in the queue
@@ -41,11 +41,11 @@ class Zend_Service_WindowsAzure_Storage_QueueInstance
 {
     /**
      * Constructor
-     * 
+     *
      * @param string $name          Name
      * @param array  $metadata      Key/value pairs of meta data
      */
-    public function __construct($name, $metadata = array()) 
+    public function __construct($name, $metadata = array())
     {
         $this->_data = array(
             'name'         => $name,
diff --git a/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php b/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php
index 7b0d85cfe1a..68746ff843d 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- *   
+ *
  * @property string $MessageId         Message ID
  * @property string $InsertionTime     Insertion time
  * @property string $ExpirationTime    Expiration time
@@ -45,7 +45,7 @@ class Zend_Service_WindowsAzure_Storage_QueueMessage
 {
     /**
      * Constructor
-     * 
+     *
      * @param string $messageId         Message ID
      * @param string $insertionTime     Insertion time
      * @param string $expirationTime    Expiration time
@@ -54,7 +54,7 @@ class Zend_Service_WindowsAzure_Storage_QueueMessage
      * @param int    $dequeueCount      Number of times the message has been dequeued. This value is incremented each time the message is subsequently dequeued.
      * @param string $messageText       Message text
      */
-    public function __construct($messageId, $insertionTime, $expirationTime, $popReceipt, $timeNextVisible, $dequeueCount, $messageText) 
+    public function __construct($messageId, $insertionTime, $expirationTime, $popReceipt, $timeNextVisible, $dequeueCount, $messageText)
     {
         $this->_data = array(
             'messageid'       => $messageId,
diff --git a/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php b/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
index 22af156c5f7..4e7d39b0eb7 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string $Id           Id for the signed identifier
  * @property string $Start        The time at which the Shared Access Signature becomes valid.
  * @property string $Expiry       The time at which the Shared Access Signature becomes invalid.
@@ -42,13 +42,13 @@ class Zend_Service_WindowsAzure_Storage_SignedIdentifier
 {
     /**
      * Constructor
-     * 
+     *
      * @param string $id           Id for the signed identifier
      * @param string $start        The time at which the Shared Access Signature becomes valid.
      * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
      * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
      */
-    public function __construct($id = '', $start = '', $expiry = '', $permissions = '') 
+    public function __construct($id = '', $start = '', $expiry = '', $permissions = '')
     {
         $this->_data = array(
             'id'           => $id,
diff --git a/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php b/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php
index 1226daa03ed..dcd3e4cddf0 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php
@@ -26,20 +26,20 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  */
 abstract class Zend_Service_WindowsAzure_Storage_StorageEntityAbstract
 {
     /**
      * Data
-     * 
+     *
      * @var array
      */
     protected $_data = null;
-    
+
     /**
      * Magic overload for setting properties
-     * 
+     *
      * @param string $name     Name of the property
      * @param string $value    Value to set
      */
@@ -54,7 +54,7 @@ public function __set($name, $value) {
 
     /**
      * Magic overload for getting properties
-     * 
+     *
      * @param string $name     Name of the property
      */
     public function __get($name) {
diff --git a/lib/Zend/Service/WindowsAzure/Storage/Table.php b/lib/Zend/Service/WindowsAzure/Storage/Table.php
index 81a666495d8..c4f0852ff28 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/Table.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/Table.php
@@ -41,7 +41,7 @@
 #require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php';
 
 /**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite 
+ * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite
  */
 #require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';
 
@@ -58,22 +58,22 @@ class Zend_Service_WindowsAzure_Storage_Table
 	/**
 	 * Throw Zend_Service_WindowsAzure_Exception when a property is not specified in Windows Azure?
 	 * Defaults to true, making behaviour similar to Windows Azure StorageClient in .NET.
-	 * 
+	 *
 	 * @var boolean
 	 */
 	protected $_throwExceptionOnMissingData = true;
-	
+
 	/**
 	 * Throw Zend_Service_WindowsAzure_Exception when a property is not specified in Windows Azure?
 	 * Defaults to true, making behaviour similar to Windows Azure StorageClient in .NET.
-	 * 
+	 *
 	 * @param boolean $value
 	 */
 	public function setThrowExceptionOnMissingData($value = true)
 	{
 		$this->_throwExceptionOnMissingData = $value;
 	}
-	
+
 	/**
 	 * Throw Zend_Service_WindowsAzure_Exception when a property is not specified in Windows Azure?
 	 */
@@ -81,7 +81,7 @@ public function getThrowExceptionOnMissingData()
 	{
 		return $this->_throwExceptionOnMissingData;
 	}
-	
+
 	/**
 	 * Creates a new Zend_Service_WindowsAzure_Storage_Table instance
 	 *
@@ -97,14 +97,14 @@ public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_T
 
 	    // Always use SharedKeyLite authentication
 	    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKeyLite($accountName, $accountKey, $this->_usePathStyleUri);
-	    
+
 	    // API version
 		$this->_apiVersion = '2009-09-19';
 	}
-	
+
 	/**
 	 * Check if a table exists
-	 * 
+	 *
 	 * @param string $tableName Table name
 	 * @return boolean
 	 */
@@ -114,7 +114,7 @@ public function tableExists($tableName = '')
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
 		}
-			
+
 		// List tables
         $tables = $this->listTables(); // 2009-09-19 does not support $this->listTables($tableName); all of a sudden...
         foreach ($tables as $table) {
@@ -122,10 +122,10 @@ public function tableExists($tableName = '')
                 return true;
             }
         }
-        
+
         return false;
 	}
-	
+
 	/**
 	 * List tables
 	 *
@@ -141,17 +141,17 @@ public function listTables($nextTableName = '')
 	        $queryString[] = 'NextTableName=' . $nextTableName;
 	    }
 	    $queryString = self::createQueryStringFromArray($queryString);
-	    
+
 		// Perform request
 		$response = $this->_performRequest('Tables', $queryString, Zend_Http_Client::GET, null, true);
-		if ($response->isSuccessful()) {	    
+		if ($response->isSuccessful()) {
 		    // Parse result
-		    $result = $this->_parseResponse($response);	
-		    
+		    $result = $this->_parseResponse($response);
+
 		    if (!$result || !$result->entry) {
 		        return array();
 		    }
-	        
+
 		    $entries = null;
 		    if (count($result->entry) > 1) {
 		        $entries = $result->entry;
@@ -160,11 +160,11 @@ public function listTables($nextTableName = '')
 		    }
 
 		    // Create return value
-		    $returnValue = array();		    
+		    $returnValue = array();
 		    foreach ($entries as $entry) {
 		        $tableName = $entry->xpath('.//m:properties/d:TableName');
 		        $tableName = (string)$tableName[0];
-		        
+
 		        $returnValue[] = new Zend_Service_WindowsAzure_Storage_TableInstance(
 		            (string)$entry->id,
 		            $tableName,
@@ -172,7 +172,7 @@ public function listTables($nextTableName = '')
 		            (string)$entry->updated
 		        );
 		    }
-		    
+
 			// More tables?
 		    if (!is_null($response->getHeader('x-ms-continuation-NextTableName'))) {
 				#require_once 'Zend/Service/WindowsAzure/Exception.php';
@@ -184,7 +184,7 @@ public function listTables($nextTableName = '')
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Create table
 	 *
@@ -197,7 +197,7 @@ public function createTable($tableName = '')
 		if ($tableName === '') {
 			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
 		}
-			
+
 		// Generate request body
 		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
                         <entry
@@ -216,30 +216,30 @@ public function createTable($tableName = '')
                             </m:properties>
                           </content>
                         </entry>';
-		
+
         $requestBody = $this->_fillTemplate($requestBody, array(
             'BaseUrl' => $this->getBaseUrl(),
             'TableName' => htmlspecialchars($tableName),
         	'Updated' => $this->isoDate(),
             'AccountName' => $this->_accountName
         ));
-        
+
         // Add header information
         $headers = array();
         $headers['Content-Type'] = 'application/atom+xml';
         $headers['DataServiceVersion'] = '1.0;NetFx';
-        $headers['MaxDataServiceVersion'] = '1.0;NetFx';        
+        $headers['MaxDataServiceVersion'] = '1.0;NetFx';
 
 		// Perform request
 		$response = $this->_performRequest('Tables', '', Zend_Http_Client::POST, $headers, true, $requestBody);
 		if ($response->isSuccessful()) {
 		    // Parse response
 		    $entry = $this->_parseResponse($response);
-		    
+
 		    $tableName = $entry->xpath('.//m:properties/d:TableName');
 		    $tableName = (string)$tableName[0];
-		        
-			
+
+
 		    return new Zend_Service_WindowsAzure_Storage_TableInstance(
 		        (string)$entry->id,
 		        $tableName,
@@ -251,7 +251,7 @@ public function createTable($tableName = '')
                     throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Create table if it does not exist
 	 *
@@ -264,7 +264,7 @@ public function createTableIfNotExists($tableName = '')
 			$this->createTable($tableName);
 		}
 	}
-	
+
 	/**
 	 * Delete table
 	 *
@@ -289,10 +289,10 @@ public function deleteTable($tableName = '')
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Insert entity into table
-	 * 
+	 *
 	 * @param string                              $tableName   Table name
 	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to insert
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntity
@@ -308,7 +308,7 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
 		}
-		                     
+
 		// Generate request body
 		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
                         <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
@@ -324,7 +324,7 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
                             </m:properties>
                           </content>
                         </entry>';
-		
+
         $requestBody = $this->_fillTemplate($requestBody, array(
         	'Updated'    => $this->isoDate(),
             'Properties' => $this->_generateAzureRepresentation($entity)
@@ -345,13 +345,13 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
 		if ($response->isSuccessful()) {
 		    // Parse result
 		    $result = $this->_parseResponse($response);
-		    
+
 		    $timestamp = $result->xpath('//m:properties/d:Timestamp');
 		    $timestamp = $this->_convertToDateTime( (string)$timestamp[0] );
 
 		    $etag      = $result->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
 		    $etag      = (string)$etag['etag'];
-		    
+
 		    // Update properties
 		    $entity->setTimestamp($timestamp);
 		    $entity->setEtag($etag);
@@ -362,10 +362,10 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Delete entity from table
-	 * 
+	 *
 	 * @param string                              $tableName   Table name
 	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to delete
 	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
@@ -381,7 +381,7 @@ public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
 		}
-		                     
+
         // Add header information
         $headers = array();
         if (!$this->isInBatch()) {
@@ -408,14 +408,14 @@ public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Retrieve entity from table, by id
-	 * 
+	 *
 	 * @param string $tableName    Table name
 	 * @param string $partitionKey Partition key
 	 * @param string $rowKey       Row key
-	 * @param string $entityClass  Entity class name* 
+	 * @param string $entityClass  Entity class name*
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntity
 	 * @throws Zend_Service_WindowsAzure_Exception
 	 */
@@ -438,7 +438,7 @@ public function retrieveEntityById($tableName, $partitionKey, $rowKey, $entityCl
 			throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.');
 		}
 
-			
+
 		// Check for combined size of partition key and row key
 		// http://msdn.microsoft.com/en-us/library/dd179421.aspx
 		if (strlen($partitionKey . $rowKey) >= 256) {
@@ -447,10 +447,10 @@ public function retrieveEntityById($tableName, $partitionKey, $rowKey, $entityCl
 				#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		        throw new Zend_Service_WindowsAzure_Exception('Entity cannot be retrieved. A transaction is required to retrieve the entity, but another transaction is already active.');
 		    }
-		        
+
 		    $this->startBatch();
 		}
-		
+
 		// Fetch entities from Azure
         $result = $this->retrieveEntities(
             $this->select()
@@ -460,29 +460,29 @@ public function retrieveEntityById($tableName, $partitionKey, $rowKey, $entityCl
             '',
             $entityClass
         );
-        
+
         // Return
         if (count($result) == 1) {
             return $result[0];
         }
-        
+
         return null;
 	}
-	
+
 	/**
 	 * Create a new Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 * 
+	 *
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	 */
 	public function select()
 	{
-            
+
 	    return new Zend_Service_WindowsAzure_Storage_TableEntityQuery();
 	}
-	
+
 	/**
 	 * Retrieve entities from table
-	 * 
+	 *
 	 * @param string $tableName|Zend_Service_WindowsAzure_Storage_TableEntityQuery    Table name -or- Zend_Service_WindowsAzure_Storage_TableEntityQuery instance
 	 * @param string $filter                                                Filter condition (not applied when $tableName is a Zend_Service_WindowsAzure_Storage_TableEntityQuery instance)
 	 * @param string $entityClass                                           Entity class name
@@ -507,27 +507,27 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 		    $entityClass = $filter;
 		    $filter = '';
 		}
-			
+
 		// Query string
 		$queryString = '';
 
 		// Determine query
 		if (is_string($tableName)) {
 		    // Option 1: $tableName is a string
-		    
+
 		    // Append parentheses
 		    if (strpos($tableName, '()') === false) {
 		    	$tableName .= '()';
 		    }
-		    
+
     	    // Build query
     	    $query = array();
-    	    
+
     		// Filter?
     		if ($filter !== '') {
     		    $query[] = '$filter=' . Zend_Service_WindowsAzure_Storage_TableEntityQuery::encodeQuery($filter);
     		}
-    		    
+
     	    // Build queryString
     	    if (count($query) > 0)  {
     	        $queryString = '?' . implode('&', $query);
@@ -544,7 +544,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 		    throw new Zend_Service_WindowsAzure_Exception('Invalid argument: $tableName');
 		}
-		
+
 		// Add continuation querystring parameters?
 		if (!is_null($nextPartitionKey) && !is_null($nextRowKey)) {
 		    if ($queryString !== '') {
@@ -552,7 +552,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 		    } else {
 		    	$queryString .= '?';
 		    }
-		        
+
 		    $queryString .= 'NextPartitionKey=' . rawurlencode($nextPartitionKey) . '&NextRowKey=' . rawurlencode($nextRowKey);
 		}
 
@@ -561,7 +561,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 	    if ($this->isInBatch() && $this->getCurrentBatch()->getOperationCount() == 0) {
 		    $this->getCurrentBatch()->enlistOperation($tableName, $queryString, Zend_Http_Client::GET, array(), true, null);
 		    $response = $this->getCurrentBatch()->commit();
-		    
+
 		    // Get inner response (multipart)
 		    $innerResponse = $response->getBody();
 		    $innerResponse = substr($innerResponse, strpos($innerResponse, 'HTTP/1.1 200 OK'));
@@ -596,19 +596,19 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 		    }
 
 		    // Create return value
-		    $returnValue = array();		    
+		    $returnValue = array();
 		    foreach ($entries as $entry) {
     		    // Parse properties
     		    $properties = $entry->xpath('.//m:properties');
     		    $properties = $properties[0]->children('http://schemas.microsoft.com/ado/2007/08/dataservices');
-    		    
+
     		    // Create entity
     		    $entity = new $entityClass('', '');
     		    $entity->setAzureValues((array)$properties, $this->_throwExceptionOnMissingData);
-    		    
+
     		    // If we have a Zend_Service_WindowsAzure_Storage_DynamicTableEntity, make sure all property types are set
     		    if ($entity instanceof Zend_Service_WindowsAzure_Storage_DynamicTableEntity) {
-    		        foreach ($properties as $key => $value) {  
+    		        foreach ($properties as $key => $value) {
     		            $attributes = $value->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
     		            $type = (string)$attributes['type'];
     		            if ($type !== '') {
@@ -616,12 +616,12 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
     		            }
     		        }
     		    }
-    
+
     		    // Update etag
     		    $etag      = $entry->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
     		    $etag      = (string)$etag['etag'];
     		    $entity->setEtag($etag);
-    		    
+
     		    // Add to result
     		    $returnValue[] = $entity;
 		    }
@@ -632,7 +632,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 		            $returnValue = array_merge($returnValue, $this->retrieveEntities($tableName, $filter, $entityClass, $response->getHeader('x-ms-continuation-NextPartitionKey'), $response->getHeader('x-ms-continuation-NextRowKey')));
 		        }
 		    }
-		    
+
 		    // Return
 		    return $returnValue;
 		} else {
@@ -640,10 +640,10 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = '
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Update entity by replacing it
-	 * 
+	 *
 	 * @param string                              $tableName   Table name
 	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
 	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
@@ -653,10 +653,10 @@ public function updateEntity($tableName = '', Zend_Service_WindowsAzure_Storage_
 	{
 	    return $this->_changeEntity(Zend_Http_Client::PUT, $tableName, $entity, $verifyEtag);
 	}
-	
+
 	/**
 	 * Update entity by adding or updating properties
-	 * 
+	 *
 	 * @param string                              $tableName   Table name
 	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
 	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
@@ -667,10 +667,10 @@ public function mergeEntity($tableName = '', Zend_Service_WindowsAzure_Storage_T
 	{
 		$mergeEntity = null;
 		if (is_array($properties) && count($properties) > 0) {
-			
+
 			// Build a new object
 			$mergeEntity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($entity->getPartitionKey(), $entity->getRowKey());
-			
+
 			// Keep only values mentioned in $properties
 			$azureValues = $entity->getAzureValues();
 			foreach ($azureValues as $key => $value) {
@@ -681,16 +681,16 @@ public function mergeEntity($tableName = '', Zend_Service_WindowsAzure_Storage_T
 		} else {
 			$mergeEntity = $entity;
 		}
-		
-		// Ensure entity timestamp matches updated timestamp 
+
+		// Ensure entity timestamp matches updated timestamp
         $entity->setTimestamp(new DateTime());
-        
+
 	    return $this->_changeEntity(Zend_Http_Client::MERGE, $tableName, $mergeEntity, $verifyEtag);
 	}
-	
+
 	/**
 	 * Get error message from Zend_Http_Response
-	 * 
+	 *
 	 * @param Zend_Http_Response $response Repsonse
 	 * @param string $alternativeError Alternative error message
 	 * @return string
@@ -704,10 +704,10 @@ protected function _getErrorMessage(Zend_Http_Response $response, $alternativeEr
 		    return $alternativeError;
 		}
 	}
-	
+
 	/**
 	 * Update entity / merge entity
-	 * 
+	 *
 	 * @param string                              $httpVerb    HTTP verb to use (PUT = update, MERGE = merge)
 	 * @param string                              $tableName   Table name
 	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
@@ -720,11 +720,11 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName =
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
 		}
-		if (is_null($entity)) {	
+		if (is_null($entity)) {
 			#require_once 'Zend/Service/WindowsAzure/Exception.php';
 			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
 		}
-		                     
+
         // Add header information
         $headers = array();
         $headers['Content-Type']   = 'application/atom+xml';
@@ -750,10 +750,10 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName =
                             </m:properties>
                           </content>
                         </entry>';
-		
+
 		// Attempt to get timestamp from entity
         $timestamp = $entity->getTimestamp();
-        
+
         $requestBody = $this->_fillTemplate($requestBody, array(
         	'Updated'    => $this->_convertToEdmDateTime($timestamp),
             'Properties' => $this->_generateAzureRepresentation($entity)
@@ -767,7 +767,7 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName =
         } else {
             $headers['If-Match']       = $entity->getEtag();
         }
-        
+
 		// Perform request
 		$response = null;
 	    if ($this->isInBatch()) {
@@ -787,20 +787,20 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName =
 			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
 		}
 	}
-	
+
 	/**
 	 * Generate RFC 1123 compliant date string
-	 * 
+	 *
 	 * @return string
 	 */
 	protected function _rfcDate()
 	{
 	    return gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
 	}
-	
+
 	/**
 	 * Fill text template with variables from key/value array
-	 * 
+	 *
 	 * @param string $templateText Template text
 	 * @param array $variables Array containing key/value pairs
 	 * @return string
@@ -812,10 +812,10 @@ protected function _fillTemplate($templateText, $variables = array())
 	    }
 	    return $templateText;
 	}
-	
+
 	/**
 	 * Generate Azure representation from entity (creates atompub markup from properties)
-	 * 
+	 *
 	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity
 	 * @return string
 	 */
@@ -831,10 +831,10 @@ protected function _generateAzureRepresentation(Zend_Service_WindowsAzure_Storag
 		        $value[] = ' m:type="' . $azureValue->Type . '"';
 		    }
 		    if (is_null($azureValue->Value)) {
-		        $value[] = ' m:null="true"'; 
+		        $value[] = ' m:null="true"';
 		    }
 		    $value[] = '>';
-		    
+
 		    if (!is_null($azureValue->Value)) {
 		        if (strtolower($azureValue->Type) == 'edm.boolean') {
 		            $value[] = ($azureValue->Value == true ? '1' : '0');
@@ -844,14 +844,14 @@ protected function _generateAzureRepresentation(Zend_Service_WindowsAzure_Storag
 		            $value[] = htmlspecialchars($azureValue->Value);
 		        }
 		    }
-		    
+
 		    $value[] = '</d:' . $azureValue->Name . '>';
 		    $azureRepresentation[] = implode('', $value);
 		}
 
 		return implode('', $azureRepresentation);
 	}
-	
+
 		/**
 	 * Perform request using Zend_Http_Client channel
 	 *
@@ -890,20 +890,20 @@ protected function _performRequest(
 			$resourceType,
 			$requiredPermission
 		);
-	}  
-	  
+	}
+
     /**
      * Converts a string to a DateTime object. Returns false on failure.
-     * 
+     *
      * @param string $value The string value to parse
      * @return DateTime|boolean
      */
-    protected function _convertToDateTime($value = '') 
+    protected function _convertToDateTime($value = '')
     {
     	if ($value instanceof DateTime) {
     		return $value;
     	}
-    	
+
     	try {
     		if (substr($value, -1) == 'Z') {
     			$value = substr($value, 0, strlen($value) - 1);
@@ -914,15 +914,15 @@ protected function _convertToDateTime($value = '')
     		return false;
     	}
     }
-    
+
     /**
      * Converts a DateTime object into an Edm.DaeTime value in UTC timezone,
      * represented as a string.
-     * 
+     *
      * @param DateTime $value
      * @return string
      */
-    protected function _convertToEdmDateTime(DateTime $value) 
+    protected function _convertToEdmDateTime(DateTime $value)
     {
     	$cloned = clone $value;
     	$cloned->setTimezone(new DateTimeZone('UTC'));
diff --git a/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php b/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php
index d3b6860c6bb..9ac374d1b66 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/TableEntity.php
@@ -31,47 +31,47 @@ class Zend_Service_WindowsAzure_Storage_TableEntity
 {
     /**
      * Partition key
-     * 
+     *
      * @var string
      */
     protected $_partitionKey;
-    
+
     /**
      * Row key
-     * 
+     *
      * @var string
      */
     protected $_rowKey;
-    
+
     /**
      * Timestamp
-     * 
+     *
      * @var string
      */
     protected $_timestamp;
-    
+
     /**
      * Etag
-     * 
+     *
      * @var string
      */
     protected $_etag = '';
-    
+
     /**
      * Constructor
-     * 
+     *
      * @param string  $partitionKey    Partition key
      * @param string  $rowKey          Row key
      */
-    public function __construct($partitionKey = '', $rowKey = '') 
-    {	        
+    public function __construct($partitionKey = '', $rowKey = '')
+    {
         $this->_partitionKey = $partitionKey;
         $this->_rowKey       = $rowKey;
     }
-    
+
     /**
      * Get partition key
-     * 
+     *
      * @azure PartitionKey
      * @return string
      */
@@ -79,10 +79,10 @@ public function getPartitionKey()
     {
         return $this->_partitionKey;
     }
-    
+
     /**
      * Set partition key
-     * 
+     *
      * @azure PartitionKey
      * @param string $value
      */
@@ -90,10 +90,10 @@ public function setPartitionKey($value)
     {
         $this->_partitionKey = $value;
     }
-    
+
     /**
      * Get row key
-     * 
+     *
      * @azure RowKey
      * @return string
      */
@@ -101,10 +101,10 @@ public function getRowKey()
     {
         return $this->_rowKey;
     }
-    
+
     /**
      * Set row key
-     * 
+     *
      * @azure RowKey
      * @param string $value
      */
@@ -112,10 +112,10 @@ public function setRowKey($value)
     {
         $this->_rowKey = $value;
     }
-    
+
     /**
      * Get timestamp
-     * 
+     *
      * @azure Timestamp Edm.DateTime
      * @return string
      */
@@ -126,10 +126,10 @@ public function getTimestamp()
         }
         return $this->_timestamp;
     }
-    
+
     /**
      * Set timestamp
-     * 
+     *
      * @azure Timestamp Edm.DateTime
      * @param DateTime $value
      */
@@ -137,37 +137,37 @@ public function setTimestamp(DateTime $value)
     {
         $this->_timestamp = $value;
     }
-    
+
     /**
      * Get etag
-     * 
+     *
      * @return string
      */
     public function getEtag()
     {
         return $this->_etag;
     }
-    
+
     /**
      * Set etag
-     * 
+     *
      * @param string $value
      */
     public function setEtag($value = '')
     {
         $this->_etag = $value;
     }
-    
+
     /**
      * Get Azure values
-     * 
+     *
      * @return array
      */
     public function getAzureValues()
     {
         // Get accessors
         $accessors = self::getAzureAccessors(get_class($this));
-        
+
         // Loop accessors and retrieve values
         $returnValue = array();
         foreach ($accessors as $accessor) {
@@ -187,14 +187,14 @@ public function getAzureValues()
                 );
             }
         }
-        
+
         // Return
         return $returnValue;
     }
-    
+
     /**
      * Set Azure values
-     * 
+     *
      * @param array $values
      * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values?
      * @throws Zend_Service_WindowsAzure_Exception
@@ -203,7 +203,7 @@ public function setAzureValues($values = array(), $throwOnError = false)
     {
         // Get accessors
         $accessors = self::getAzureAccessors(get_class($this));
-        
+
         // Loop accessors and set values
         $returnValue = array();
         foreach ($accessors as $accessor) {
@@ -226,7 +226,7 @@ public function setAzureValues($values = array(), $throwOnError = false)
         	            	$values[$accessor->AzurePropertyName] = $this->_convertToDateTime($values[$accessor->AzurePropertyName]); break;
         	        }
                 }
-                
+
                 // Assign value
                 if ($accessor->EntityType == 'ReflectionProperty') {
                     $property = $accessor->EntityAccessor;
@@ -237,17 +237,17 @@ public function setAzureValues($values = array(), $throwOnError = false)
                 }
             } else if ($throwOnError) {
 				#require_once 'Zend/Service/WindowsAzure/Exception.php';
-                throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array");    
+                throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array");
             }
         }
-        
+
         // Return
         return $returnValue;
     }
-    
+
     /**
      * Get Azure accessors from class
-     * 
+     *
      * @param string $className Class to get accessors for
      * @return array
      */
@@ -255,10 +255,10 @@ public static function getAzureAccessors($className = '')
     {
         // List of accessors
         $azureAccessors = array();
-        
+
         // Get all types
         $type = new ReflectionClass($className);
-        
+
         // Loop all properties
         $properties = $type->getProperties();
         foreach ($properties as $property) {
@@ -267,7 +267,7 @@ public static function getAzureAccessors($className = '')
                 $azureAccessors[] = $accessor;
             }
         }
-        
+
         // Loop all methods
         $methods = $type->getMethods();
         foreach ($methods as $method) {
@@ -276,14 +276,14 @@ public static function getAzureAccessors($className = '')
                 $azureAccessors[] = $accessor;
             }
         }
-        
+
         // Return
         return $azureAccessors;
     }
-    
+
     /**
      * Get Azure accessor from reflection member
-     * 
+     *
      * @param ReflectionProperty|ReflectionMethod $member
      * @return object
      */
@@ -291,13 +291,13 @@ public static function getAzureAccessor($member)
     {
         // Get comment
         $docComment = $member->getDocComment();
-        
+
         // Check for Azure comment
         if (strpos($docComment, '@azure') === false)
         {
             return null;
         }
-            
+
         // Search for @azure contents
         $azureComment = '';
         $commentLines = explode("\n", $docComment);
@@ -310,7 +310,7 @@ public static function getAzureAccessor($member)
                 break;
             }
         }
-        
+
         // Fetch @azure properties
         $azureProperties = explode(' ', $azureComment);
         return (object)array(
@@ -320,23 +320,23 @@ public static function getAzureAccessor($member)
         	'AzurePropertyType' => isset($azureProperties[1]) ? $azureProperties[1] : ''
         );
     }
-    
+
     /**
      * Converts a string to a DateTime object. Returns false on failure.
-     * 
+     *
      * @param string $value The string value to parse
      * @return DateTime|boolean
      */
-    protected function _convertToDateTime($value = '') 
+    protected function _convertToDateTime($value = '')
     {
     	if ($value === '') {
     		return false;
     	}
-    	
+
     	if ($value instanceof DateTime) {
     		return $value;
     	}
-    	
+
     	if (@strtotime($value) !== false) {
 	    	try {
 	    		if (substr($value, -1) == 'Z') {
@@ -348,7 +348,7 @@ protected function _convertToDateTime($value = '')
 	    		return false;
 	    	}
 	    }
-    	
+
     	return false;
     }
 }
diff --git a/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php b/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
index f7904d2ef2d..9b0ae93fcad 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
@@ -31,59 +31,59 @@ class Zend_Service_WindowsAzure_Storage_TableEntityQuery
 {
     /**
      * From
-     * 
+     *
      * @var string
      */
 	protected $_from  = '';
-	
+
 	/**
 	 * Where
-	 * 
+	 *
 	 * @var array
 	 */
 	protected $_where = array();
-	
+
 	/**
 	 * Order by
-	 * 
+	 *
 	 * @var array
 	 */
 	protected $_orderBy = array();
-	
+
 	/**
 	 * Top
-	 * 
+	 *
 	 * @var int
 	 */
 	protected $_top = null;
-	
+
 	/**
 	 * Partition key
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_partitionKey = null;
 
 	/**
 	 * Row key
-	 * 
+	 *
 	 * @var string
 	 */
 	protected $_rowKey = null;
-	
+
 	/**
 	 * Select clause
-	 * 
+	 *
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	 */
 	public function select()
 	{
 		return $this;
 	}
-	
+
 	/**
 	 * From clause
-	 * 
+	 *
 	 * @param string $name Table name to select entities from
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	 */
@@ -92,10 +92,10 @@ public function from($name)
 		$this->_from = $name;
 		return $this;
 	}
-	
+
 	/**
 	 * Specify partition key
-	 * 
+	 *
 	 * @param string $value Partition key to query for
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	 */
@@ -104,10 +104,10 @@ public function wherePartitionKey($value = null)
 	    $this->_partitionKey = $value;
 	    return $this;
 	}
-	
+
 	/**
 	 * Specify row key
-	 * 
+	 *
 	 * @param string $value Row key to query for
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	 */
@@ -116,10 +116,10 @@ public function whereRowKey($value = null)
 	    $this->_rowKey = $value;
 	    return $this;
 	}
-	
+
 	/**
 	 * Add where clause
-	 * 
+	 *
 	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
 	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
 	 * @param string       $cond        Condition for the clause (and/or/not)
@@ -128,24 +128,24 @@ public function whereRowKey($value = null)
 	public function where($condition, $value = null, $cond = '')
 	{
 	    $condition = $this->_replaceOperators($condition);
-	    
+
 	    if (!is_null($value)) {
 	        $condition = $this->_quoteInto($condition, $value);
 	    }
-	    
+
 		if (count($this->_where) == 0) {
 			$cond = '';
 		} else if ($cond !== '') {
 			$cond = ' ' . strtolower(trim($cond)) . ' ';
 		}
-		
+
 		$this->_where[] = $cond . $condition;
 		return $this;
 	}
 
 	/**
 	 * Add where clause with AND condition
-	 * 
+	 *
 	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
 	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
@@ -154,10 +154,10 @@ public function andWhere($condition, $value = null)
 	{
 		return $this->where($condition, $value, 'and');
 	}
-	
+
 	/**
 	 * Add where clause with OR condition
-	 * 
+	 *
 	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
 	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
@@ -166,10 +166,10 @@ public function orWhere($condition, $value = null)
 	{
 		return $this->where($condition, $value, 'or');
 	}
-	
+
 	/**
 	 * OrderBy clause
-	 * 
+	 *
 	 * @param string $column    Column to sort by
 	 * @param string $direction Direction to sort (asc/desc)
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
@@ -179,10 +179,10 @@ public function orderBy($column, $direction = 'asc')
 		$this->_orderBy[] = $column . ' ' . $direction;
 		return $this;
 	}
-    
+
 	/**
 	 * Top clause
-	 * 
+	 *
 	 * @param int $top  Top to fetch
 	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
 	 */
@@ -191,10 +191,10 @@ public function top($top = null)
         $this->_top  = (int)$top;
         return $this;
     }
-	
+
     /**
      * Assembles the query string
-     * 
+     *
      * @param boolean $urlEncode Apply URL encoding to the query string
      * @return string
      */
@@ -205,26 +205,26 @@ public function assembleQueryString($urlEncode = false)
 		    $filter = implode('', $this->_where);
 			$query[] = '$filter=' . ($urlEncode ? self::encodeQuery($filter) : $filter);
 		}
-		
+
 		if (count($this->_orderBy) != 0) {
 		    $orderBy = implode(',', $this->_orderBy);
 			$query[] = '$orderby=' . ($urlEncode ? self::encodeQuery($orderBy) : $orderBy);
 		}
-		
+
 		if (!is_null($this->_top)) {
 			$query[] = '$top=' . $this->_top;
 		}
-		
+
 		if (count($query) != 0) {
 			return '?' . implode('&', $query);
 		}
-		
+
 		return '';
 	}
-	
+
 	/**
 	 * Assemble from
-	 * 
+	 *
 	 * @param boolean $includeParentheses Include parentheses? ()
 	 * @return string
 	 */
@@ -233,44 +233,44 @@ public function assembleFrom($includeParentheses = true)
 	    $identifier = '';
 	    if ($includeParentheses) {
 	        $identifier .= '(';
-	        
+
 	        if (!is_null($this->_partitionKey)) {
 	            $identifier .= 'PartitionKey=\'' . self::encodeQuery($this->_partitionKey) . '\'';
 	        }
-	            
+
 	        if (!is_null($this->_partitionKey) && !is_null($this->_rowKey)) {
 	            $identifier .= ', ';
 	        }
-	            
+
 	        if (!is_null($this->_rowKey)) {
 	            $identifier .= 'RowKey=\'' . self::encodeQuery($this->_rowKey) . '\'';
 	        }
-	            
+
 	        $identifier .= ')';
 	    }
 		return $this->_from . $identifier;
 	}
-	
+
 	/**
 	 * Assemble full query
-	 * 
+	 *
 	 * @return string
 	 */
 	public function assembleQuery()
 	{
 		$assembledQuery = $this->assembleFrom();
-		
+
 		$queryString = $this->assembleQueryString();
 		if ($queryString !== '') {
 			$assembledQuery .= $queryString;
 		}
-		
+
 		return $assembledQuery;
 	}
-	
+
 	/**
 	 * Quotes a variable into a condition
-	 * 
+	 *
 	 * @param string       $text   Condition, can contain question mark(s) (?) for parameter insertion.
 	 * @param string|array $value  Value(s) to insert in question mark (?) parameters.
 	 * @return string
@@ -291,10 +291,10 @@ protected function _quoteInto($text, $value = null)
 	    }
 	    return $text;
 	}
-	
+
 	/**
 	 * Replace operators
-	 * 
+	 *
 	 * @param string $text
 	 * @return string
 	 */
@@ -306,17 +306,17 @@ protected function _replaceOperators($text)
 	    $text = str_replace('>=', 'ge',  $text);
 	    $text = str_replace('<=', 'le',  $text);
 	    $text = str_replace('!=', 'ne',  $text);
-	    
+
 	    $text = str_replace('&&', 'and', $text);
 	    $text = str_replace('||', 'or',  $text);
 	    $text = str_replace('!',  'not', $text);
-	    
+
 	    return $text;
 	}
-	
+
 	/**
 	 * urlencode a query
-	 * 
+	 *
 	 * @param string $query Query to encode
 	 * @return string Encoded query
 	 */
@@ -335,13 +335,13 @@ public static function encodeQuery($query)
 		$query = str_replace('}', '%7D', $query);
 
 		$query = str_replace(' ', '%20', $query);
-		
+
 		return $query;
 	}
-	
+
 	/**
 	 * __toString overload
-	 * 
+	 *
 	 * @return string
 	 */
 	public function __toString()
diff --git a/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php b/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php
index deabf67a321..2799449b466 100644
--- a/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php
+++ b/lib/Zend/Service/WindowsAzure/Storage/TableInstance.php
@@ -31,7 +31,7 @@
  * @subpackage Storage
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
+ *
  * @property string  $Id              Id
  * @property string  $Name            Name
  * @property string  $Href            Href
@@ -42,14 +42,14 @@ class Zend_Service_WindowsAzure_Storage_TableInstance
 {
     /**
      * Constructor
-     * 
+     *
      * @param string  $id              Id
      * @param string  $name            Name
      * @param string  $href            Href
      * @param string  $updated         Updated
      */
-    public function __construct($id, $name, $href, $updated) 
-    {	        
+    public function __construct($id, $name, $href, $updated)
+    {
         $this->_data = array(
             'id'               => $id,
             'name'             => $name,
diff --git a/lib/Zend/Session.php b/lib/Zend/Session.php
index d3a4a957196..8281631b06b 100644
--- a/lib/Zend/Session.php
+++ b/lib/Zend/Session.php
@@ -605,7 +605,7 @@ private static function _processStartupMetadataGlobal()
                         unset($_SESSION['__ZF'][$namespace]['ENVGH']);
                     }
                 }
-                
+
                 if (isset($namespace) && empty($_SESSION['__ZF'][$namespace])) {
                     unset($_SESSION['__ZF'][$namespace]);
                 }
diff --git a/lib/Zend/Soap/Client/Local.php b/lib/Zend/Soap/Client/Local.php
index 6cf2e1d2015..a25c35b10a2 100644
--- a/lib/Zend/Soap/Client/Local.php
+++ b/lib/Zend/Soap/Client/Local.php
@@ -84,7 +84,7 @@ public function _doRequest(Zend_Soap_Client_Common $client, $request, $location,
         ob_start();
         $this->_server->handle($request);
         $response = ob_get_clean();
- 
+
         if ($response === null || $response === '') {
             $serverResponse = $this->server->getResponse();
             if ($serverResponse !== null) {
diff --git a/lib/Zend/Soap/Server.php b/lib/Zend/Soap/Server.php
index 9725c0272b1..203ffdba602 100644
--- a/lib/Zend/Soap/Server.php
+++ b/lib/Zend/Soap/Server.php
@@ -94,11 +94,11 @@ class Zend_Soap_Server implements Zend_Server_Interface
 
     /**
      * WS-I compliant
-     * 
-     * @var boolean 
+     *
+     * @var boolean
      */
     protected $_wsiCompliant;
-    
+
     /**
      * Registered fault exceptions
      * @var array
@@ -279,14 +279,14 @@ public function getOptions()
         if (null !== $this->_wsiCompliant) {
             $options['wsi_compliant'] = $this->_wsiCompliant;
         }
-        
+
         return $options;
     }
     /**
      * Set WS-I compliant
-     * 
+     *
      * @param  boolean $value
-     * @return Zend_Soap_Server 
+     * @return Zend_Soap_Server
      */
     public function setWsiCompliant($value)
     {
@@ -297,10 +297,10 @@ public function setWsiCompliant($value)
     }
     /**
      * Gt WS-I compliant
-     * 
+     *
      * @return boolean
      */
-    public function getWsiCompliant() 
+    public function getWsiCompliant()
     {
         return $this->_wsiCompliant;
     }
@@ -640,7 +640,7 @@ public function setObject($object)
             $this->_object = new Zend_Soap_Server_Proxy($object);
         } else {
             $this->_object = $object;
-        }    
+        }
 
         return $this;
     }
@@ -823,7 +823,7 @@ protected function _getSoap()
             if ($this->_wsiCompliant) {
                 #require_once 'Zend/Soap/Server/Proxy.php';
                 array_unshift($args, 'Zend_Soap_Server_Proxy');
-            } 
+            }
             call_user_func_array(array($server, 'setClass'), $args);
         }
 
@@ -876,7 +876,7 @@ public function handle($request = null)
         } catch (Zend_Soap_Server_Exception $e) {
             $setRequestException = $e;
         }
-        
+
         $soap = $this->_getSoap();
 
         $fault = false;
diff --git a/lib/Zend/Soap/Server/Proxy.php b/lib/Zend/Soap/Server/Proxy.php
index 93b6ab4e6a0..3139cadfc11 100644
--- a/lib/Zend/Soap/Server/Proxy.php
+++ b/lib/Zend/Soap/Server/Proxy.php
@@ -32,8 +32,8 @@ class Zend_Soap_Server_Proxy
     protected $_className;
     /**
      * Constructor
-     * 
-     * @param object $service 
+     *
+     * @param object $service
      */
     public function  __construct($className, $classArgs = array())
     {
@@ -48,10 +48,10 @@ public function  __construct($className, $classArgs = array())
     }
     /**
      * Proxy for the WS-I compliant call
-     * 
+     *
      * @param  string $name
      * @param  string $arguments
-     * @return array 
+     * @return array
      */
     public function __call($name, $arguments)
     {
@@ -60,9 +60,9 @@ public function __call($name, $arguments)
     }
     /**
      *  Pre process arguments
-     * 
+     *
      * @param  mixed $arguments
-     * @return array 
+     * @return array
      */
     protected function _preProcessArguments($arguments)
     {
diff --git a/lib/Zend/Soap/Wsdl.php b/lib/Zend/Soap/Wsdl.php
index bbbc91a3cc2..774089bcaff 100644
--- a/lib/Zend/Soap/Wsdl.php
+++ b/lib/Zend/Soap/Wsdl.php
@@ -103,7 +103,7 @@ public function __construct($name, $uri, $strategy = true)
         if (!$this->_dom = Zend_Xml_Security::scan($wsdl, $this->_dom)) {
             #require_once 'Zend/Server/Exception.php';
             throw new Zend_Server_Exception('Unable to create DomDocument');
-        } 
+        }
         $this->_wsdl = $this->_dom->documentElement;
 
         $this->setComplexTypeStrategy($strategy);
diff --git a/lib/Zend/Stdlib/CallbackHandler.php b/lib/Zend/Stdlib/CallbackHandler.php
index da5c75d0317..b45892645d3 100644
--- a/lib/Zend/Stdlib/CallbackHandler.php
+++ b/lib/Zend/Stdlib/CallbackHandler.php
@@ -51,9 +51,9 @@ class Zend_Stdlib_CallbackHandler
 
     /**
      * Constructor
-     * 
+     *
      * @param  string $event Event to which slot is subscribed
-     * @param  string|array|object $callback PHP callback 
+     * @param  string|array|object $callback PHP callback
      * @param  array $options Options used by the callback handler (e.g., priority)
      * @return void
      */
@@ -67,9 +67,9 @@ public function __construct($callback, array $metadata = array())
      * Error handler
      *
      * Used by registerCallback() when calling is_callable() to capture engine warnings.
-     * 
-     * @param  int $errno 
-     * @param  string $errstr 
+     *
+     * @param  int $errno
+     * @param  string $errstr
      * @return void
      */
     public function errorHandler($errno, $errstr)
@@ -80,14 +80,14 @@ public function errorHandler($errno, $errstr)
     /**
      * Registers the callback provided in the constructor
      *
-     * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed, 
+     * If you have pecl/weakref {@see http://pecl.php.net/weakref} installed,
      * this method provides additional behavior.
      *
-     * If a callback is a functor, or an array callback composing an object 
+     * If a callback is a functor, or an array callback composing an object
      * instance, this method will pass the object to a WeakRef instance prior
      * to registering the callback.
-     * 
-     * @param  Callable $callback 
+     *
+     * @param  Callable $callback
      * @return void
      */
     protected function registerCallback($callback)
@@ -126,7 +126,7 @@ protected function registerCallback($callback)
 
         list($target, $method) = $callback;
 
-        // If we have an array callback, and the first argument is not an 
+        // If we have an array callback, and the first argument is not an
         // object, register as-is
         if (!is_object($target)) {
             $this->callback = $callback;
@@ -141,7 +141,7 @@ protected function registerCallback($callback)
 
     /**
      * Retrieve registered callback
-     * 
+     *
      * @return Callable
      */
     public function getCallback()
@@ -163,7 +163,7 @@ public function getCallback()
             return $callback;
         }
 
-        // Array callback with WeakRef object -- retrieve the object first, and 
+        // Array callback with WeakRef object -- retrieve the object first, and
         // then return
         list($target, $method) = $callback;
         if ($target instanceof WeakRef) {
@@ -176,7 +176,7 @@ public function getCallback()
 
     /**
      * Invoke handler
-     * 
+     *
      * @param  array $args Arguments to pass to callback
      * @return mixed
      */
@@ -190,7 +190,7 @@ public function call(array $args = array())
             $this->validateStringCallbackFor54($callback);
         }
 
-        // Minor performance tweak; use call_user_func() until > 3 arguments 
+        // Minor performance tweak; use call_user_func() until > 3 arguments
         // reached
         switch (count($args)) {
             case 0:
@@ -225,7 +225,7 @@ public function call(array $args = array())
 
     /**
      * Invoke as functor
-     * 
+     *
      * @return mixed
      */
     public function __invoke()
@@ -235,7 +235,7 @@ public function __invoke()
 
     /**
      * Get all callback metadata
-     * 
+     *
      * @return array
      */
     public function getMetadata()
@@ -245,8 +245,8 @@ public function getMetadata()
 
     /**
      * Retrieve a single metadatum
-     * 
-     * @param  string $name 
+     *
+     * @param  string $name
      * @return mixed
      */
     public function getMetadatum($name)
@@ -261,8 +261,8 @@ public function getMetadatum($name)
      * Validate a static method call
      *
      * Validates that a static method call in PHP 5.4 will actually work
-     * 
-     * @param  string $callback 
+     *
+     * @param  string $callback
      * @return true
      * @throws Zend_Stdlib_Exception_InvalidCallbackException if invalid
      */
diff --git a/lib/Zend/Stdlib/PriorityQueue.php b/lib/Zend/Stdlib/PriorityQueue.php
index 64a0be68c8a..380b2766cb0 100644
--- a/lib/Zend/Stdlib/PriorityQueue.php
+++ b/lib/Zend/Stdlib/PriorityQueue.php
@@ -24,11 +24,11 @@
  * Re-usable, serializable priority queue implementation
  *
  * SplPriorityQueue acts as a heap; on iteration, each item is removed from the
- * queue. If you wish to re-use such a queue, you need to clone it first. This 
+ * queue. If you wish to re-use such a queue, you need to clone it first. This
  * makes for some interesting issues if you wish to delete items from the queue,
  * or, as already stated, iterate over it multiple times.
  *
- * This class aggregates items for the queue itself, but also composes an 
+ * This class aggregates items for the queue itself, but also composes an
  * "inner" iterator in the form of an SplPriorityQueue object for performing
  * the actual iteration.
  *
@@ -66,9 +66,9 @@ class Zend_Stdlib_PriorityQueue implements Countable, IteratorAggregate, Seriali
      * Insert an item into the queue
      *
      * Priority defaults to 1 (low priority) if none provided.
-     * 
-     * @param  mixed $data 
-     * @param  int $priority 
+     *
+     * @param  mixed $data
+     * @param  int $priority
      * @return Zend_Stdlib_PriorityQueue
      */
     public function insert($data, $priority = 1)
@@ -88,11 +88,11 @@ public function insert($data, $priority = 1)
      * This is different than {@link extract()}; its purpose is to dequeue an
      * item.
      *
-     * This operation is potentially expensive, as it requires 
+     * This operation is potentially expensive, as it requires
      * re-initialization and re-population of the inner queue.
-     * 
+     *
      * Note: this removes the first item matching the provided item found. If
-     * the same item has been added multiple times, it will not remove other 
+     * the same item has been added multiple times, it will not remove other
      * instances.
      *
      * @param  mixed $datum
@@ -121,7 +121,7 @@ public function remove($datum)
 
     /**
      * Is the queue empty?
-     * 
+     *
      * @return bool
      */
     public function isEmpty()
@@ -131,7 +131,7 @@ public function isEmpty()
 
     /**
      * How many items are in the queue?
-     * 
+     *
      * @return int
      */
     public function count()
@@ -141,7 +141,7 @@ public function count()
 
     /**
      * Peek at the top node in the queue, based on priority.
-     * 
+     *
      * @return mixed
      */
     public function top()
@@ -150,8 +150,8 @@ public function top()
     }
 
     /**
-     * Extract a node from the inner queue and sift up 
-     * 
+     * Extract a node from the inner queue and sift up
+     *
      * @return mixed
      */
     public function extract()
@@ -164,11 +164,11 @@ public function extract()
      *
      * SplPriorityQueue acts as a heap, which typically implies that as items
      * are iterated, they are also removed. This does not work for situations
-     * where the queue may be iterated multiple times. As such, this class 
-     * aggregates the values, and also injects an SplPriorityQueue. This method 
-     * retrieves the inner queue object, and clones it for purposes of 
+     * where the queue may be iterated multiple times. As such, this class
+     * aggregates the values, and also injects an SplPriorityQueue. This method
+     * retrieves the inner queue object, and clones it for purposes of
      * iteration.
-     * 
+     *
      * @return SplPriorityQueue
      */
     public function getIterator()
@@ -179,7 +179,7 @@ public function getIterator()
 
     /**
      * Serialize the data structure
-     * 
+     *
      * @return string
      */
     public function serialize()
@@ -191,8 +191,8 @@ public function serialize()
      * Unserialize a string into a Zend_Stdlib_PriorityQueue object
      *
      * Serialization format is compatible with {@link Zend_Stdlib_SplPriorityQueue}
-     * 
-     * @param  string $data 
+     *
+     * @param  string $data
      * @return void
      */
     public function unserialize($data)
@@ -208,8 +208,8 @@ public function unserialize($data)
      * By default, returns only the item data, and in the order registered (not
      * sorted). You may provide one of the EXTR_* flags as an argument, allowing
      * the ability to return priorities or both data and priority.
-     * 
-     * @param  int $flag 
+     *
+     * @param  int $flag
      * @return array
      */
     public function toArray($flag = self::EXTR_DATA)
@@ -230,8 +230,8 @@ public function toArray($flag = self::EXTR_DATA)
      *
      * Please see {@link getIterator()} for details on the necessity of an
      * internal queue class. The class provided should extend SplPriorityQueue.
-     * 
-     * @param  string $class 
+     *
+     * @param  string $class
      * @return Zend_Stdlib_PriorityQueue
      */
     public function setInternalQueueClass($class)
@@ -242,8 +242,8 @@ public function setInternalQueueClass($class)
 
     /**
      * Does the queue contain the given datum?
-     * 
-     * @param  mixed $datum 
+     *
+     * @param  mixed $datum
      * @return bool
      */
     public function contains($datum)
@@ -258,8 +258,8 @@ public function contains($datum)
 
     /**
      * Does the queue have an item with the given priority?
-     * 
-     * @param  int $priority 
+     *
+     * @param  int $priority
      * @return bool
      */
     public function hasPriority($priority)
@@ -274,7 +274,7 @@ public function hasPriority($priority)
 
     /**
      * Get the inner priority queue instance
-     * 
+     *
      * @return Zend_Stdlib_SplPriorityQueue
      */
     protected function getQueue()
@@ -295,8 +295,8 @@ protected function getQueue()
      * Return priority from an internal item
      *
      * Used as a lambda in toArray().
-     * 
-     * @param  array $item 
+     *
+     * @param  array $item
      * @return mixed
      */
     public function returnPriority($item)
@@ -308,8 +308,8 @@ public function returnPriority($item)
      * Return data from an internal item
      *
      * Used as a lambda in toArray().
-     * 
-     * @param  array $item 
+     *
+     * @param  array $item
      * @return mixed
      */
     public function returnData($item)
diff --git a/lib/Zend/Stdlib/SplPriorityQueue.php b/lib/Zend/Stdlib/SplPriorityQueue.php
index bf19cc7aaed..7694cec85ee 100644
--- a/lib/Zend/Stdlib/SplPriorityQueue.php
+++ b/lib/Zend/Stdlib/SplPriorityQueue.php
@@ -20,11 +20,11 @@
 
 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
     /**
-     * SplPriorityQueue 
+     * SplPriorityQueue
      *
      * PHP 5.2.X userland implementation of PHP's SplPriorityQueue
      */
-    class SplPriorityQueue implements Iterator , Countable 
+    class SplPriorityQueue implements Iterator , Countable
     {
         /**
          * Extract data only
@@ -66,9 +66,9 @@ class SplPriorityQueue implements Iterator , Countable
 
         /**
          * Constructor
-         * 
+         *
          * Creates a new, empty queue
-         * 
+         *
          * @return void
          */
         public function __construct()
@@ -78,10 +78,10 @@ public function __construct()
         /**
          * Compare two priorities
          *
-         * Returns positive integer if $priority1 is greater than $priority2, 0 
+         * Returns positive integer if $priority1 is greater than $priority2, 0
          * if equal, negative otherwise.
          *
-         * Unused internally, and only included in order to retain the same 
+         * Unused internally, and only included in order to retain the same
          * interface as PHP's SplPriorityQueue.
          *
          * @param  mixed $priority1
@@ -102,7 +102,7 @@ public function compare($priority1, $priority2)
 
         /**
          * Countable: return number of items composed in the queue
-         * 
+         *
          * @return int
          */
         public function count()
@@ -245,7 +245,7 @@ public function next()
         /**
          * Recover from corrupted state and allow further actions on the queue
          *
-         * Unimplemented, and only included in order to retain the same interface as PHP's 
+         * Unimplemented, and only included in order to retain the same interface as PHP's
          * SplPriorityQueue.
          *
          * @return void
@@ -268,10 +268,10 @@ public function rewind()
 
         /**
          * Set the extract flags
-         * 
-         * Defines what is extracted by SplPriorityQueue::current(), 
+         *
+         * Defines what is extracted by SplPriorityQueue::current(),
          * SplPriorityQueue::top() and SplPriorityQueue::extract().
-         * 
+         *
          * - SplPriorityQueue::EXTR_DATA (0x00000001): Extract the data
          * - SplPriorityQueue::EXTR_PRIORITY (0x00000002): Extract the priority
          * - SplPriorityQueue::EXTR_BOTH (0x00000003): Extract an array containing both
@@ -295,7 +295,7 @@ public function setExtractFlags($flags)
         }
 
         /**
-         * Return the value or priority (or both) of the top node, depending on 
+         * Return the value or priority (or both) of the top node, depending on
          * the extract flag
          *
          * @return mixed
@@ -335,7 +335,7 @@ public function valid()
 
         /**
          * Sort the queue
-         * 
+         *
          * @return void
          */
         protected function sort()
@@ -345,7 +345,7 @@ protected function sort()
 
         /**
          * Prepare the queue for iteration and/or extraction
-         * 
+         *
          * @return void
          */
         protected function prepareQueue()
@@ -398,7 +398,7 @@ class Zend_Stdlib_SplPriorityQueue extends SplPriorityQueue implements Serializa
 
     /**
      * Constructor
-     * 
+     *
      * @return void
      */
     public function __construct()
@@ -409,11 +409,11 @@ public function __construct()
     /**
      * Insert a value with a given priority
      *
-     * Utilizes {@var $serial} to ensure that values of equal priority are 
+     * Utilizes {@var $serial} to ensure that values of equal priority are
      * emitted in the same order in which they are inserted.
-     * 
-     * @param  mixed $datum 
-     * @param  mixed $priority 
+     *
+     * @param  mixed $datum
+     * @param  mixed $priority
      * @return void
      */
     public function insert($datum, $priority)
@@ -434,7 +434,7 @@ public function insert($datum, $priority)
      * Serialize to an array
      *
      * Array will be priority => data pairs
-     * 
+     *
      * @return array
      */
     public function toArray()
@@ -463,7 +463,7 @@ public function toArray()
 
     /**
      * Serialize
-     * 
+     *
      * @return string
      */
     public function serialize()
@@ -486,7 +486,7 @@ public function serialize()
 
     /**
      * Deserialize
-     * 
+     *
      * @param  string $data
      * @return void
      */
diff --git a/lib/Zend/Test/PHPUnit/Constraint/DomQuery37.php b/lib/Zend/Test/PHPUnit/Constraint/DomQuery37.php
index 0e480e86f19..2d07f09ded7 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/DomQuery37.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/DomQuery37.php
@@ -136,7 +136,7 @@ public function setUseXpath($flag = true)
      * @param  null|string  Assertion type
      * @param  string       (optional) String to match (needle), may be required depending on assertion type
      * @return bool
-     * 
+     *
      * NOTE:
      * Drastic changes up to PHPUnit 3.5.15 this was:
      *     public function evaluate($other, $assertType = null)
diff --git a/lib/Zend/Test/PHPUnit/Constraint/DomQuery41.php b/lib/Zend/Test/PHPUnit/Constraint/DomQuery41.php
index 15f07a941a4..631d5587a76 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/DomQuery41.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/DomQuery41.php
@@ -136,7 +136,7 @@ public function setUseXpath($flag = true)
      * @param  null|string  Assertion type
      * @param  string       (optional) String to match (needle), may be required depending on assertion type
      * @return bool
-     * 
+     *
      * NOTE:
      * Drastic changes up to PHPUnit 3.5.15 this was:
      *     public function evaluate($other, $assertType = null)
diff --git a/lib/Zend/Test/PHPUnit/Constraint/Redirect34.php b/lib/Zend/Test/PHPUnit/Constraint/Redirect34.php
index c5c6e01247f..8f350189bba 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/Redirect34.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/Redirect34.php
@@ -61,7 +61,7 @@ class Zend_Test_PHPUnit_Constraint_Redirect34 extends PHPUnit_Framework_Constrai
      * @var string
      */
     protected $_match             = null;
-    
+
     /**
      * What is actual redirect
      */
diff --git a/lib/Zend/Test/PHPUnit/Constraint/Redirect37.php b/lib/Zend/Test/PHPUnit/Constraint/Redirect37.php
index 163dd42e207..f47c491eeeb 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/Redirect37.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/Redirect37.php
@@ -61,7 +61,7 @@ class Zend_Test_PHPUnit_Constraint_Redirect37 extends PHPUnit_Framework_Constrai
      * @var string
      */
     protected $_match             = null;
-    
+
     /**
      * What is actual redirect
      */
diff --git a/lib/Zend/Test/PHPUnit/Constraint/Redirect41.php b/lib/Zend/Test/PHPUnit/Constraint/Redirect41.php
index 04d60bb1935..35423a6a588 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/Redirect41.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/Redirect41.php
@@ -61,7 +61,7 @@ class Zend_Test_PHPUnit_Constraint_Redirect41 extends PHPUnit_Framework_Constrai
      * @var string
      */
     protected $_match             = null;
-    
+
     /**
      * What is actual redirect
      */
diff --git a/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php b/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php
index 7dc7d87d9b7..e866af3888e 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php
@@ -62,7 +62,7 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader34 extends PHPUnit_Framework_Co
      * @var int Response code
      */
     protected $_code              = 200;
-    
+
     /**
      * @var int Actual response code
      */
diff --git a/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php b/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php
index 32c3d7a3b40..aea80339d4f 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php
@@ -62,7 +62,7 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader37 extends PHPUnit_Framework_Co
      * @var int Response code
      */
     protected $_code              = 200;
-    
+
     /**
      * @var int Actual response code
      */
diff --git a/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php b/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
index adf822d171f..e5da1f965f7 100644
--- a/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
+++ b/lib/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php
@@ -62,7 +62,7 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader41 extends PHPUnit_Framework_Co
      * @var int Response code
      */
     protected $_code              = 200;
-    
+
     /**
      * @var int Actual response code
      */
diff --git a/lib/Zend/Text/MultiByte.php b/lib/Zend/Text/MultiByte.php
index ad6a9165629..c5f559421f2 100644
--- a/lib/Zend/Text/MultiByte.php
+++ b/lib/Zend/Text/MultiByte.php
@@ -43,7 +43,7 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals
     {
         $stringWidth = iconv_strlen($string, $charset);
         $breakWidth  = iconv_strlen($break, $charset);
-        
+
         if (strlen($string) === 0) {
             return '';
         } elseif ($breakWidth === null) {
@@ -51,19 +51,19 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals
         } elseif ($width === 0 && $cut) {
             throw new Zend_Text_Exception('Can\'t force cut when width is zero');
         }
-        
+
         $result    = '';
         $lastStart = $lastSpace = 0;
-        
+
         for ($current = 0; $current < $stringWidth; $current++) {
             $char = iconv_substr($string, $current, 1, $charset);
-            
+
             if ($breakWidth === 1) {
                 $possibleBreak = $char;
             } else {
                 $possibleBreak = iconv_substr($string, $current, $breakWidth, $charset);
             }
-            
+
             if ($possibleBreak === $break) {
                 $result    .= iconv_substr($string, $lastStart, $current - $lastStart + $breakWidth, $charset);
                 $current   += $breakWidth - 1;
@@ -73,7 +73,7 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals
                     $result    .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break;
                     $lastStart  = $current + 1;
                 }
-                
+
                 $lastSpace = $current;
             } elseif ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) {
                 $result    .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break;
@@ -83,11 +83,11 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals
                 $lastStart  = $lastSpace = $lastSpace + 1;
             }
         }
-        
+
         if ($lastStart !== $current) {
             $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset);
         }
-        
+
         return $result;
     }
 
diff --git a/lib/Zend/Tool/Framework/Manifest/Metadata.php b/lib/Zend/Tool/Framework/Manifest/Metadata.php
index f816b9da8f1..5e0a6c29b8e 100644
--- a/lib/Zend/Tool/Framework/Manifest/Metadata.php
+++ b/lib/Zend/Tool/Framework/Manifest/Metadata.php
@@ -27,5 +27,5 @@
  */
 class Zend_Tool_Framework_Manifest_Metadata
 {
-    
+
 }
diff --git a/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php b/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php
index d6df9711a07..45bf8518677 100644
--- a/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/ControllerFile.php
@@ -101,7 +101,7 @@ public function getControllerName()
     public function getContents()
     {
         $filter = new Zend_Filter_Word_DashToCamelCase();
-        
+
         $className = ($this->_moduleName) ? $filter->filter(ucfirst($this->_moduleName)) . '_' : '';
         $className .= ucfirst($this->_controllerName) . 'Controller';
 
diff --git a/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php b/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php
index 5648b18047f..3714504a96c 100644
--- a/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php
@@ -70,11 +70,11 @@ public function getContents()
 RewriteCond %{REQUEST_FILENAME} -l [OR]
 RewriteCond %{REQUEST_FILENAME} -d
 RewriteRule ^.*$ - [NC,L]
-# The following rewrites all other queries to index.php. The 
+# The following rewrites all other queries to index.php. The
 # condition ensures that if you are using Apache aliases to do
-# mass virtual hosting, the base path will be prepended to 
+# mass virtual hosting, the base path will be prepended to
 # allow proper resolution of the index.php file; it will work
-# in non-aliased environments as well, providing a safe, one-size 
+# in non-aliased environments as well, providing a safe, one-size
 # fits all solution.
 RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$
 RewriteRule ^(.*)$ - [E=BASE:%1]
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php b/lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php
index 77e480ff8a5..d51f2879fed 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php
@@ -139,7 +139,7 @@ public function getForActionName()
     public function create()
     {
         $file = $this->_testApplicationControllerPath;
-        
+
         if (!file_exists($file)) {
             #require_once 'Zend/Tool/Project/Context/Exception.php';
             throw new Zend_Tool_Project_Context_Exception(
@@ -147,11 +147,11 @@ public function create()
                 . ' with action name ' . $this->_forActionName
                 );
         }
-        
+
         $actionParam = $this->getForActionName();
         $controllerParam = $this->_resource->getParentResource()->getForControllerName();
         //$moduleParam = null;//
-        
+
         /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */
         $controllerDirectoryResource = $this->_resource->getParentResource()->getParentResource();
         if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') {
@@ -159,8 +159,8 @@ public function create()
         } else {
             $moduleParam = 'default';
         }
-        
-        
+
+
 
         if ($actionParam == 'index' && $controllerParam == 'Index' && $moduleParam == 'default') {
             $assert = '$this->assertQueryContentContains("div#welcome h3", "This is your project\'s main page");';
@@ -172,7 +172,7 @@ public function create()
     );
 EOS;
         }
-        
+
         $codeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($file, true, true);
         $codeGenFile->getClass()->setMethod(array(
             'name' => 'test' . ucfirst($actionParam) . 'Action',
@@ -192,7 +192,7 @@ public function create()
             ));
 
         file_put_contents($file, $codeGenFile->generate());
-        
+
         return $this;
     }
 
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php b/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php
index 282d4b38e10..f0eb72e0956 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php
@@ -82,12 +82,12 @@ public function getPersistentAttributes()
 
         return $attributes;
     }
-    
+
     public function getForControllerName()
     {
         return $this->_forControllerName;
     }
-    
+
     /**
      * getContents()
      *
@@ -99,14 +99,14 @@ public function getContents()
         $filter = new Zend_Filter_Word_DashToCamelCase();
 
         $className = $filter->filter($this->_forControllerName) . 'ControllerTest';
-        
+
         /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */
         $controllerDirectoryResource = $this->_resource->getParentResource();
         if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') {
             $className = $filter->filter(ucfirst($controllerDirectoryResource->getParentResource()->getForModuleName()))
                 . '_' . $className;
-        }        
-        
+        }
+
         $codeGenFile = new Zend_CodeGenerator_Php_File(array(
             'classes' => array(
                 new Zend_CodeGenerator_Php_Class(array(
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php b/lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php
index 7ec0625dd73..148689c87fa 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php
@@ -93,6 +93,6 @@ public function getForModuleName()
     {
         return $this->_forModuleName;
     }
-    
+
 
 }
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php b/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php
index cbd91b96bd3..da953fe8867 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php
@@ -53,7 +53,7 @@ public function getName()
     {
         return 'TestPHPUnitBootstrapFile';
     }
-    
+
     /**
      * getContents()
      *
diff --git a/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php b/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php
index d6a47096b68..48faaa9996d 100644
--- a/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php
@@ -53,7 +53,7 @@ public function getName()
     {
         return 'TestPHPUnitConfigFile';
     }
-    
+
     public function getContents()
     {
         return <<<EOS
@@ -64,10 +64,10 @@ public function getContents()
     <testsuite name="Library Test Suite">
         <directory>./library</directory>
     </testsuite>
-    
+
     <filter>
         <!-- If Zend Framework is inside your project's library, uncomment this filter -->
-        <!-- 
+        <!--
         <whitelist>
             <directory suffix=".php">../../library/Zend</directory>
         </whitelist>
diff --git a/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php b/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
index 885a322bca2..724702a3442 100644
--- a/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
+++ b/lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
@@ -131,7 +131,7 @@ public function getContents()
         $contents = '';
 
         $controllerName = $this->_resource->getParentResource()->getAttribute('forControllerName');
-        
+
         $viewsDirectoryResource = $this->_resource
             ->getParentResource() // view script
             ->getParentResource() // view controller dir
@@ -141,7 +141,7 @@ public function getContents()
         } else {
             $moduleName = 'default';
         }
-        
+
         if ($this->_filesystemName == 'error.phtml') {  // should also check that the above directory is forController=error
             $contents .= <<<EOS
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -155,7 +155,7 @@ public function getContents()
   <h2><?php echo \$this->message ?></h2>
 
   <?php if (isset(\$this->exception)): ?>
-  
+
   <h3>Exception information:</h3>
   <p>
       <b>Message:</b> <?php echo \$this->exception->getMessage() ?>
diff --git a/lib/Zend/Tool/Project/Provider/Controller.php b/lib/Zend/Tool/Project/Provider/Controller.php
index 2e3bb8dcc4c..5c8bf44a0c2 100644
--- a/lib/Zend/Tool/Project/Provider/Controller.php
+++ b/lib/Zend/Tool/Project/Provider/Controller.php
@@ -115,7 +115,7 @@ public function create($name, $indexActionIncluded = true, $module = null)
         // get request & response
         $request = $this->_registry->getRequest();
         $response = $this->_registry->getResponse();
-        
+
         // determine if testing is enabled in the project
         #require_once 'Zend/Tool/Project/Provider/Test.php';
         $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile);
@@ -127,10 +127,10 @@ public function create($name, $indexActionIncluded = true, $module = null)
                 array('color' => array('yellow'))
                 );
         }
-        
+
         $originalName = $name;
         $name = ucfirst($name);
-        
+
         if (self::hasResource($this->_loadedProfile, $name, $module)) {
             throw new Zend_Tool_Project_Provider_Exception('This project already has a controller named ' . $name);
         }
diff --git a/lib/Zend/Tool/Project/Provider/DbTable.php b/lib/Zend/Tool/Project/Provider/DbTable.php
index 128e5198281..9996f8b6b9f 100644
--- a/lib/Zend/Tool/Project/Provider/DbTable.php
+++ b/lib/Zend/Tool/Project/Provider/DbTable.php
@@ -146,7 +146,7 @@ public function create($name, $actualTableName, $module = null, $forceOverwrite
     /**
      * @param string $module        Module name action should be applied to.
      * @param bool $forceOverwrite  Whether should force overwriting previous classes generated
-     * @return void 
+     * @return void
      */
     public function createFromDatabase($module = null, $forceOverwrite = false)
     {
diff --git a/lib/Zend/Tool/Project/Provider/Layout.php b/lib/Zend/Tool/Project/Provider/Layout.php
index 19d8a070f99..b0d0c20231e 100644
--- a/lib/Zend/Tool/Project/Provider/Layout.php
+++ b/lib/Zend/Tool/Project/Provider/Layout.php
@@ -86,7 +86,7 @@ public function enable()
             $applicationConfigResource->create();
 
             $this->_registry->getResponse()->appendContent('A layout entry has been added to the application config file.');
-            
+
             $layoutScriptFile = self::createResource($profile);
             if (!$layoutScriptFile->exists()) {
                 $layoutScriptFile->create();
diff --git a/lib/Zend/Tool/Project/Provider/Model.php b/lib/Zend/Tool/Project/Provider/Model.php
index 71f8015e488..9f234c51e55 100644
--- a/lib/Zend/Tool/Project/Provider/Model.php
+++ b/lib/Zend/Tool/Project/Provider/Model.php
@@ -67,11 +67,11 @@ public static function hasResource(Zend_Tool_Project_Profile $profile, $modelNam
         }
 
         $modelsDirectory = self::_getModelsDirectoryResource($profile, $moduleName);
-        
+
         if (!$modelsDirectory instanceof Zend_Tool_Project_Profile_Resource) {
             return false;
         }
-        
+
         return (($modelsDirectory->search(array('modelFile' => array('modelName' => $modelName)))) instanceof Zend_Tool_Project_Profile_Resource);
     }
 
diff --git a/lib/Zend/Tool/Project/Provider/Module.php b/lib/Zend/Tool/Project/Provider/Module.php
index a3088ad634a..4405bc8a1a2 100644
--- a/lib/Zend/Tool/Project/Provider/Module.php
+++ b/lib/Zend/Tool/Project/Provider/Module.php
@@ -139,7 +139,7 @@ public function create($name) //, $moduleProfile = null)
         // determine if testing is enabled in the project
         #require_once 'Zend/Tool/Project/Provider/Test.php';
         //$testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile);
-        
+
         $resources = self::createResources($this->_loadedProfile, $name);
 
         $response = $this->_registry->getResponse();
diff --git a/lib/Zend/Tool/Project/Provider/Project.php b/lib/Zend/Tool/Project/Provider/Project.php
index 42551ba0f47..f148983d1d7 100644
--- a/lib/Zend/Tool/Project/Provider/Project.php
+++ b/lib/Zend/Tool/Project/Provider/Project.php
@@ -102,7 +102,7 @@ public function create($path, $nameOfProfile = null, $fileOfProfile = null)
             $response->appendContent('Testing Note: ', array('separator' => false, 'color' => 'yellow'));
             $response->appendContent('PHPUnit was not found in your include_path, therefore no testing actions will be created.');
         }
-            
+
         foreach ($newProfile->getIterator() as $resource) {
             $resource->create();
         }
@@ -129,7 +129,7 @@ protected function _getDefaultProfile()
         if (Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) {
             $testAction = '                    	<testApplicationActionMethod forActionName="index" />';
         }
-        
+
         $version = Zend_Version::VERSION;
 
         $data = <<<EOS
diff --git a/lib/Zend/Tool/Project/Provider/Test.php b/lib/Zend/Tool/Project/Provider/Test.php
index 0f8ce4b20b2..768e9e9bff0 100644
--- a/lib/Zend/Tool/Project/Provider/Test.php
+++ b/lib/Zend/Tool/Project/Provider/Test.php
@@ -60,16 +60,16 @@ public static function isPHPUnitAvailable()
         if (class_exists('PHPUnit_Runner_Version', false)) {
             return true;
         }
-        
+
         $included = @include 'PHPUnit/Runner/Version.php';
-        
+
         if ($included === false) {
             return false;
         } else {
             return true;
         }
     }
-    
+
     /**
      * createApplicationResource()
      *
@@ -100,11 +100,11 @@ public static function createApplicationResource(Zend_Tool_Project_Profile $prof
             if (($testAppModulesDirectoryResource = $testParentOfControllerDirectoryResource->search('testApplicationModulesDirectory')) === false) {
                 $testAppModulesDirectoryResource = $testParentOfControllerDirectoryResource->createResource('testApplicationModulesDirectory');
             }
-            
+
             if (($testAppModuleDirectoryResource = $testAppModulesDirectoryResource->search(array('testApplicationModuleDirectory' => array('forModuleName' => $moduleName)))) === false) {
                 $testAppModuleDirectoryResource = $testAppModulesDirectoryResource->createResource('testApplicationModuleDirectory', array('forModuleName' => $moduleName));
             }
-            
+
             $testParentOfControllerDirectoryResource = $testAppModuleDirectoryResource;
         }
 
@@ -115,7 +115,7 @@ public static function createApplicationResource(Zend_Tool_Project_Profile $prof
         if (($testAppControllerFileResource = $testAppControllerDirectoryResource->search(array('testApplicationControllerFile' => array('forControllerName' => $controllerName)))) === false) {
             $testAppControllerFileResource = $testAppControllerDirectoryResource->createResource('testApplicationControllerFile', array('forControllerName' => $controllerName));
         }
-        
+
         return $testAppControllerFileResource->createResource('testApplicationActionMethod', array('forActionName' => $actionName));
     }
 
diff --git a/lib/Zend/Translate/Adapter.php b/lib/Zend/Translate/Adapter.php
index b2817b19657..1a7dbb90d7c 100644
--- a/lib/Zend/Translate/Adapter.php
+++ b/lib/Zend/Translate/Adapter.php
@@ -214,7 +214,7 @@ public function addTranslation($options = array())
         } else if (!is_array($options)) {
             $options = array('content' => $options);
         }
-        
+
         if (!isset($options['content']) || empty($options['content'])) {
             #require_once 'Zend/Translate/Exception.php';
             throw new Zend_Translate_Exception("Required option 'content' is missing");
@@ -254,7 +254,7 @@ public function addTranslation($options = array())
                 ),
                 RecursiveIteratorIterator::SELF_FIRST
             );
-            
+
             foreach ($iterator as $directory => $info) {
                 $file = $info->getFilename();
                 if (is_array($options['ignore'])) {
@@ -323,7 +323,7 @@ public function addTranslation($options = array())
                     }
                 }
             }
-            
+
             unset($iterator);
         } else {
             $this->_addTranslationData($options);
diff --git a/lib/Zend/Translate/Adapter/Gettext.php b/lib/Zend/Translate/Adapter/Gettext.php
index d375c33bcfa..bddec6ce50d 100644
--- a/lib/Zend/Translate/Adapter/Gettext.php
+++ b/lib/Zend/Translate/Adapter/Gettext.php
@@ -133,7 +133,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr
                 }
             }
         }
-        
+
         @fclose($this->_file);
 
         $this->_data[$locale][''] = trim($this->_data[$locale]['']);
diff --git a/lib/Zend/Translate/Adapter/Qt.php b/lib/Zend/Translate/Adapter/Qt.php
index cefc8a34a7e..f89aa9f16cb 100644
--- a/lib/Zend/Translate/Adapter/Qt.php
+++ b/lib/Zend/Translate/Adapter/Qt.php
@@ -77,7 +77,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr
         xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
         xml_set_element_handler($this->_file, "_startElement", "_endElement");
         xml_set_character_data_handler($this->_file, "_contentElement");
-        
+
         try {
             Zend_Xml_Security::scanFile($filename);
         } catch (Zend_Xml_Exception $e) {
diff --git a/lib/Zend/Translate/Adapter/Tmx.php b/lib/Zend/Translate/Adapter/Tmx.php
index cc1e1602364..3ced9ab450c 100644
--- a/lib/Zend/Translate/Adapter/Tmx.php
+++ b/lib/Zend/Translate/Adapter/Tmx.php
@@ -86,7 +86,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr
                 $e->getMessage()
             );
         }
- 
+
         if (!xml_parse($this->_file, file_get_contents($filename))) {
             $ex = sprintf('XML error: %s at line %d of file %s',
                           xml_error_string(xml_get_error_code($this->_file)),
diff --git a/lib/Zend/Uri/Http.php b/lib/Zend/Uri/Http.php
index 6d6e49b035e..27d25385610 100644
--- a/lib/Zend/Uri/Http.php
+++ b/lib/Zend/Uri/Http.php
@@ -217,17 +217,17 @@ protected function _parseUri($schemeSpecific)
 
         // Additional decomposition to get username, password, host, and port
         $combo   = isset($matches[3]) === true ? $matches[3] : '';
-        $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~';        
+        $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~';
         $status  = @preg_match($pattern, $combo, $matches);
         if ($status === false) {
             #require_once 'Zend/Uri/Exception.php';
             throw new Zend_Uri_Exception('Internal error: authority decomposition failed');
         }
-        
+
         // Save remaining URI components
         $this->_username = isset($matches[2]) === true ? $matches[2] : '';
         $this->_password = isset($matches[4]) === true ? $matches[4] : '';
-        $this->_host     = isset($matches[5]) === true 
+        $this->_host     = isset($matches[5]) === true
                          ? preg_replace('~^\[([^]]+)\]$~', '\1', $matches[5])  // Strip wrapper [] from IPv6 literal
                          : '';
         $this->_port     = isset($matches[7]) === true ? $matches[7] : '';
diff --git a/lib/Zend/Validate/Ldap/Dn.php b/lib/Zend/Validate/Ldap/Dn.php
index 68b4a414b25..892b011f14f 100644
--- a/lib/Zend/Validate/Ldap/Dn.php
+++ b/lib/Zend/Validate/Ldap/Dn.php
@@ -34,7 +34,7 @@ class Zend_Validate_Ldap_Dn extends Zend_Validate_Abstract
 {
 
     const MALFORMED = 'malformed';
-    
+
     /**
      * Validation failure message template definitions.
      *
@@ -43,17 +43,17 @@ class Zend_Validate_Ldap_Dn extends Zend_Validate_Abstract
     protected $_messageTemplates = array(
         self::MALFORMED => 'DN is malformed',
     );
-    
+
     /**
      * Defined by Zend_Validate_Interface.
      *
      * Returns true if and only if $value is a valid DN.
      *
      * @param string $value The value to be validated.
-     * 
+     *
      * @return boolean
      */
-    public function isValid($value) 
+    public function isValid($value)
     {
         $valid = Zend_Ldap_Dn::checkDn($value);
         if ($valid === false) {
diff --git a/lib/Zend/View/Helper/Doctype.php b/lib/Zend/View/Helper/Doctype.php
index 6e0653e71d3..854ba16efbd 100644
--- a/lib/Zend/View/Helper/Doctype.php
+++ b/lib/Zend/View/Helper/Doctype.php
@@ -206,11 +206,11 @@ public function isStrict()
             case self::XHTML11:
             case self::HTML4_STRICT:
                 return true;
-            default: 
+            default:
                 return false;
         }
     }
-    
+
     /**
      * Is doctype HTML5? (HeadMeta uses this for validation)
      *
@@ -219,7 +219,7 @@ public function isStrict()
     public function isHtml5() {
         return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false);
     }
-    
+
     /**
      * Is doctype RDFa?
      *
diff --git a/lib/Zend/View/Helper/Form.php b/lib/Zend/View/Helper/Form.php
index 953ab3ef1af..d0910db734c 100644
--- a/lib/Zend/View/Helper/Form.php
+++ b/lib/Zend/View/Helper/Form.php
@@ -55,13 +55,13 @@ public function form($name, $attribs = null, $content = false)
         if (array_key_exists('id', $attribs) && empty($attribs['id'])) {
             unset($attribs['id']);
         }
-        
+
         if (!empty($name) && !($this->_isXhtml() && $this->_isStrictDoctype())) {
             $name = ' name="' . $this->view->escape($name) . '"';
         } else {
             $name = '';
         }
-        
+
         if ($this->_isHtml5() && array_key_exists('action', $attribs) && !$attribs['action']) {
             unset($attribs['action']);
         }
diff --git a/lib/Zend/View/Helper/FormElement.php b/lib/Zend/View/Helper/FormElement.php
index d44ca4bf22a..980e3455271 100644
--- a/lib/Zend/View/Helper/FormElement.php
+++ b/lib/Zend/View/Helper/FormElement.php
@@ -146,12 +146,12 @@ protected function _getInfo($name, $value = null, $attribs = null,
             $info['id'] = trim(strtr($info['name'],
                                      array('[' => '-', ']' => '')), '-');
         }
-        
+
         // Remove NULL name attribute override
         if (array_key_exists('name', $attribs) && is_null($attribs['name'])) {
         	unset($attribs['name']);
         }
-        
+
         // Override name in info if specified in attribs
         if (array_key_exists('name', $attribs) && $attribs['name'] != $info['name']) {
             $info['name'] = $attribs['name'];
diff --git a/lib/Zend/View/Helper/FormRadio.php b/lib/Zend/View/Helper/FormRadio.php
index 9af82fae9a3..95db8e32717 100644
--- a/lib/Zend/View/Helper/FormRadio.php
+++ b/lib/Zend/View/Helper/FormRadio.php
@@ -125,11 +125,11 @@ public function formRadio($name, $value = null, $attribs = null,
 
         // Set up the filter - Alnum + hyphen + underscore
         #require_once 'Zend/Filter/PregReplace.php';
-        $pattern = @preg_match('/\pL/u', 'a') 
+        $pattern = @preg_match('/\pL/u', 'a')
             ? '/[^\p{L}\p{N}\-\_]/u'    // Unicode
             : '/[^a-zA-Z0-9\-\_]/';     // No Unicode
         $filter = new Zend_Filter_PregReplace($pattern, "");
-        
+
         // add radio buttons to the list.
         foreach ($options as $opt_value => $opt_label) {
 
@@ -173,7 +173,7 @@ public function formRadio($name, $value = null, $attribs = null,
             // add to the array of radio buttons
             $list[] = $radio;
         }
-        
+
         // XHTML or HTML for standard list separator?
         if (!$this->_isXhtml() && false !== strpos($listsep, '<br />')) {
             $listsep = str_replace('<br />', '<br>', $listsep);
diff --git a/lib/Zend/View/Helper/FormSelect.php b/lib/Zend/View/Helper/FormSelect.php
index d4adbb4049a..feae758826f 100644
--- a/lib/Zend/View/Helper/FormSelect.php
+++ b/lib/Zend/View/Helper/FormSelect.php
@@ -105,7 +105,7 @@ public function formSelect($name, $value = null, $attribs = null,
             $optionClasses = $attribs['optionClasses'];
             unset($attribs['optionClasses']);
         }
-        
+
         // now start building the XHTML.
         $disabled = '';
         if (true === $disable) {
diff --git a/lib/Zend/View/Helper/HeadMeta.php b/lib/Zend/View/Helper/HeadMeta.php
index ca1c78999dd..c589987a6b4 100644
--- a/lib/Zend/View/Helper/HeadMeta.php
+++ b/lib/Zend/View/Helper/HeadMeta.php
@@ -389,7 +389,7 @@ public function itemToString(stdClass $item)
             $this->_escape($item->content),
             $modifiersString
         );
-        
+
         if (isset($item->modifiers['conditional'])
             && !empty($item->modifiers['conditional'])
             && is_string($item->modifiers['conditional']))
@@ -399,7 +399,7 @@ public function itemToString(stdClass $item)
             }
             $meta = '<!--[if ' . $this->_escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
         }
-        
+
         return $meta;
     }
 
diff --git a/lib/Zend/View/Helper/HtmlElement.php b/lib/Zend/View/Helper/HtmlElement.php
index c9357611ba8..394a23608ea 100644
--- a/lib/Zend/View/Helper/HtmlElement.php
+++ b/lib/Zend/View/Helper/HtmlElement.php
@@ -96,7 +96,7 @@ protected function _isStrictDoctype()
         $doctype = $this->view->doctype();
         return $doctype->isStrict();
     }
-    
+
     /**
      * Converts an associative array to a string of tag attributes.
      *
diff --git a/lib/Zend/View/Helper/Navigation.php b/lib/Zend/View/Helper/Navigation.php
index 7d141649fff..ccafa1d4b4a 100644
--- a/lib/Zend/View/Helper/Navigation.php
+++ b/lib/Zend/View/Helper/Navigation.php
@@ -164,11 +164,11 @@ public function findHelper($proxy, $strict = true)
             // Add navigation helper path at the beginning
             $paths = $this->view->getHelperPaths();
             $this->view->setHelperPath(null);
-            
+
             $this->view->addHelperPath(
                     str_replace('_', '/', self::NS),
                     self::NS);
-            
+
             foreach ($paths as $ns => $path) {
                 $this->view->addHelperPath($path, $ns);
             }
diff --git a/lib/Zend/View/Helper/Navigation/HelperAbstract.php b/lib/Zend/View/Helper/Navigation/HelperAbstract.php
index 31ff56615cd..1251c835283 100644
--- a/lib/Zend/View/Helper/Navigation/HelperAbstract.php
+++ b/lib/Zend/View/Helper/Navigation/HelperAbstract.php
@@ -922,7 +922,7 @@ protected function _htmlAttribs($attribs)
      * @return string           Normalized ID
      */
     protected function _normalizeId($value)
-    {        
+    {
         if (false === $this->_skipPrefixForId) {
             $prefix = $this->getPrefixForId();
 
diff --git a/lib/Zend/View/Helper/Navigation/Menu.php b/lib/Zend/View/Helper/Navigation/Menu.php
index d003679e135..325dfc56047 100644
--- a/lib/Zend/View/Helper/Navigation/Menu.php
+++ b/lib/Zend/View/Helper/Navigation/Menu.php
@@ -113,7 +113,7 @@ class Zend_View_Helper_Navigation_Menu
      * @var string
      */
     protected $_innerIndent = '    ';
-    
+
     /**
      * View helper entry point:
      * Retrieves helper and optionally sets container to operate on
@@ -285,10 +285,10 @@ public function getOnlyActiveBranch()
     {
         return $this->_onlyActiveBranch;
     }
-    
+
     /**
      * Sets a flag indicating whether to expand all sibling nodes of the active branch
-     * 
+     *
      * @param  bool $flag                        [optional] expand all siblings of
      *                                           nodes in the active branch. Default is true.
      * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
@@ -311,7 +311,7 @@ public function getExpandSiblingNodesOfActiveBranch()
     {
         return $this->_expandSiblingNodesOfActiveBranch;
     }
-    
+
     /**
      * Enables/disables rendering of parents when only rendering active branch
      *
diff --git a/lib/Zend/Xml/Security.php b/lib/Zend/Xml/Security.php
index f80da9896b5..1d82a606912 100644
--- a/lib/Zend/Xml/Security.php
+++ b/lib/Zend/Xml/Security.php
@@ -19,7 +19,7 @@
  * @version    $Id$
  */
 
- 
+
 /**
  * @category   Zend
  * @package    Zend_Xml_SecurityScan
diff --git a/lib/Zend/XmlRpc/Response.php b/lib/Zend/XmlRpc/Response.php
index 2317c677429..3cdffb7c158 100644
--- a/lib/Zend/XmlRpc/Response.php
+++ b/lib/Zend/XmlRpc/Response.php
@@ -184,7 +184,7 @@ public function loadXml($response)
 
         try {
             $xml = Zend_Xml_Security::scan($response);
-        } catch (Zend_Xml_Exception $e) {    
+        } catch (Zend_Xml_Exception $e) {
             // Not valid XML
             $this->_fault = new Zend_XmlRpc_Fault(651);
             $this->_fault->setEncoding($this->getEncoding());