Merge branch 'ccp' into stable/havana

Conflicts:
	metadata.rb
Fixed cinder-backup-bug, cinder cannot parse cinder.conf
Bump metadata version
Merge pull request #17 from vnaboychenko/fix_cinder_backup_bug

Fix cinder backup bug, when cinder cannot parse cinder.conf
Merge remote-tracking branch 'upstream/stable/havana' into stable/havana

Conflicts:
	metadata.rb