Extended wait time to 30 seconds for slower computers
Merge branch 'hydro-devel' into extended_wait_time
Fixed additional timeout that was just added
Merge pull request #120 from ros-controls/extended_wait_time

Extended wait time to 30 seconds for slower computers