CBQE-0 re-organized and remove upgrade from 1.8x in new upgrade test conf

Change-Id: I5d3920ff9175b05e1660a24abab3687ff3dc5069
Reviewed-on: http://review.couchbase.org/35253
Reviewed-by: Thuan Nguyen <soccon@gmail.com>
Tested-by: Thuan Nguyen <soccon@gmail.com>