revert #712 quadicon locator

Had to revert #712 as it was hitting this bug...

https://bugzilla.redhat.com/show_bug.cgi?id=1053097
Merge pull request #713 from dajohnso/revert_quad_locator

revert #712 quadicon locator
I don't know how but it works now
Fixed errors in old timelines test, now waits for VM to be steady before powering on
Circumvent issue #716 in Control imp_exp
Merge pull request #715 from mfalesni/old_timelines_fix

[Jenkins] Old timeline tests now wait for VM to be steady before powering on.
Merge pull request #714 from mfalesni/listener_fixup

[Jenkins] Listener port "zero" fixed (probably)
Merge pull request #717 from mfalesni/import_fix

[Jenkins] Circumvent issue #716 in Control imp_exp