Removed Epoch tag/number from the cloud.spec to fix the rpm installation of Management Server, Agent and awsapi
Fixed pep8 issues arising as part of merge

Fixed pep8 issues arising as part of merge

Signed-off-by: root <root@localhost.localdomain>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>