Trying to comment out the sed replacing whitespace with nothing part in the decrypt script since the --ignore-garbage option should take care of that
Reenabling the sed replacing of whitespace before decoding the base64 encoded key, since --ignore-whitespace does not work as expected at the travis-ci server
The tests passed so we create a merge master into integration branch

* master:
  Reenabling the sed replacing of whitespace before decoding the base64 encoded key, since --ignore-whitespace does not work as expected at the travis-ci server
  Trying to comment out the sed replacing whitespace with nothing part in the decrypt script since the --ignore-garbage option should take care of that