Revert 940d740..89bff89

This rolls back to commit 940d7400274273035e8518547c552c16b81efec1.
Revert "Revert 940d740..89bff89"

This reverts commit 0fa8cddd1b6981c55b5fb45795eb1b11c3a5bf66.
Revert 0fa8cdd..54aa91b

This rolls back to commit 0fa8cddd1b6981c55b5fb45795eb1b11c3a5bf66.
revert to aws ubuntu image

openstack runs not properly on official vagrant ubuntu trusty.