COOK-3063 - Fixed bash if/else missing closing fi when cherry-pick does ...

Pull request to fix:

http://tickets.opscode.com/browse/COOK-3063