Rails 4 upgrade

Just some fixes that are included for the rails 4 update at https://github.com/crowbar/barclamp-crowbar/pull/1157 for getting feedback.
I hope so, but as we are currently not using this value we have delayed this fix to get the new ruby version in as soon as possible.