Fix bunch of affinity group tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Summary: Make vmdata_kvm.py concurrency friendly

Detail: Adds flocks, etc for calling this concurrently, since CLOUDSTACK-3484
made userdata, vmdata, start commands concurrent

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1374773177 -0600
CLOUDSTACK-2481: the wait is in seconds in copycommand
Fix pep8 that broken marvin build 10 days ago :(

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1f95493dfef7762625530f59c4b4de2b6c2165f0)