CLOUD-306 remove poller use exception logic
CLOUD-306 remove poller use correct exception
CLOUD-306 removed unused branch
Merge pull request #396 from sequenceiq/pollfix

LGTM