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.
Sure, it's not the best but hopefully we can further debug this later on :(