Testeng/rebase upstream

@benpatterson @muhammad-ammar  Please review.

Merging the Solano artifacts to edx master.  Just need to confirm that everything you expect to be here is here.