create_server cleanup

back in Nov when Matt and I were tracking down the reasons for
intermitent failures in CI, I created a create_server_with_extras
function for resource tracking servers. It is well time to purge
that and make the basic create_server serve our needs.

This turns create_server into a kwargs full function, that includes
sane defaults, and wait_until kwarg to not return until a certain
state has been reached.

Change-Id: I208b266253c0e48da66d1dd4c84a3c074c38d1a6
Merge "create_server cleanup"