CS Fix for Merge v19 -> v20

* Fix for #2315
* Fix for #1149

Author: sreichel

app/code/core/Mage/Index/Model/Lock.php

@@ -133,14 +133,14 @@ protected function _setLockFile($lockName, $block = false)
         if ($block) {
             try {
                 $result = flock($this->_getLockFile($lockName), LOCK_EX);
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 Mage::logException($e);
                 throw $e;
-            }            
+            }
         } else {
             try {
                 $result = flock($this->_getLockFile($lockName), LOCK_EX | LOCK_NB);
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 Mage::logException($e);
                 throw $e;
             }
@@ -245,7 +245,7 @@ protected function _isLockExistsFile($lockName)
                 flock($fp, LOCK_UN);
                 $result = false;
             }
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             Mage::logException($e);
             throw $e;
         }

app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php

@@ -29,7 +29,7 @@ class Mage_Sales_Model_Api2_Order_Comment_Rest_Admin_V1 extends Mage_Sales_Model
 {
     /**
      * Add comment to order
-     * 
+     *
      * @param array $data
      * @return string
      */
@@ -76,7 +76,7 @@ protected function _create(array $data)
 
     /**
      * Retrieve order comment by id
-     * 
+     *
      * @return array
      */
     protected function _retrieve()