Merge pull request #3 from crowbar/release/pebbles/master

Release/pebbles/master
Merge pull request #5 from crowbar/release/pebbles/master

Release/pebbles/master
Merge pull request #6 from crowbar/release/pebbles/master

Merge for testing
freeze activesupport for a while
Merge pull request #556 from MirantisDellCrowbar/release/pebbles/unstable/master

freeze activesupport for a while