acu134591 - Fixes for next gen collateral
add a function to helpers/input and change variable from s_one to server
acu123016 - Use regex for Google to match the new v1 cloud
Merge pull request #428 from rightscale/white_14_01_acu123016_update_new_google_v1_cloudid

acu123016 - Use regex for Google to match the new v1 cloud
acu134591 - Fix typo
acu134591 - add mapping file, formating changes, fix typo, adjust for helper
Merge branch 'white_13_08_acu134591_test_fixes_for_next_gen_collateral' of github.com:rightscale/rightscale_cookbooks_private into white_13_08_acu134591_test_fixes_for_next_gen_collateral
acu134591 - iteration fix
Merge branch 'release13.05' into white_13_08_acu134591_test_fixes_for_next_gen_collateral

Conflicts:
	Gemfile
acu134591 - Remove right_api_objects and mime-types gem as its fixed in release2.6 virtualmonkey
acu134591 -  add right_api_objects to Gemfile
Merge pull request #425 from rightscale/white_13_08_acu134591_test_fixes_for_next_gen_collateral

White 13 08 acu134591 test fixes for next gen collateral
acu123016 - [rightscale] Update rightscale_tools gem to version 1.7.34.
Merge pull request #429 from rightscale/white_14_01_acu123016_remove_raise_when_ext3_mod_not_loaded

acu123016 - [rightscale] Update rightscale_tools gem to version 1.7.34.