Fix modal "ok" button reload page
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/cloud_settings/_sshkey_index.html.erb
Merge remote-tracking branch 'ta/master'
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/cloud_dashboards/_dash_index_page.html.erb
ui issues
Merge remote-tracking branch 'origin/master'
Fix for ssh_keys index page for without any ssh_key condition
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/cloud_settings/_sshkey_index.html.erb