acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.0.
acu82853 - [block_device] Initial attempt to verify ephemeral devices support on google
acu82853 - [block_device] Get ephemeral disk from /dev/disk/by-id
acu82853 - [block_device] Should be an && condition
acu82853 - Merge branch 'master' into white_13_03_acu82853_google_volumes_support

Conflicts:
	cookbooks/rightscale/files/default/rightscale_tools-1.6.0.gem
acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.2.
acu82853 - [block_device] xfs is not supported on google. Install ext3 by default
acu82853 - [tests] Add the ephemeral_file_system_type test back to the base suite (bad merge).
* Set default file system type as ext3 on google cloud
Merge branch 'master' into white_13_03_acu82853_google_volumes_support
acu82853 - [tests] Add ephemeral_file_system_type test to before tests section
acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.2.
acu82853 - [block_device, tests] Iteration fixes
acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.2.
acu82853 - [tests] require errors helper in ephemeral helper
acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.2.
acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.2.
Merge branch 'release13.04' into white_13_03_acu82853_google_volumes_support

Conflicts:
	cookbooks/block_device/metadata.json
	cookbooks/rightscale/files/default/rightscale_tools-1.6.2.gem
acu82853 - [rightscale] Update rightscale_tools gem to version 1.6.5.
acu82853 - [tests] Enable volumes and snapshots for Google in tests
acu82853 - [tests] Move all tests before security updates so that there is no unnecessary relaunches