Fixed order of compute_driver/connection_type checking (OS-84)

Added test

Change-Id: Ibca48e9fa927405f63e2365c60899bba294541ae
Merge "Fixed order of compute_driver/connection_type checking (OS-84)" into stable/folsom