Merge remote aslakknutsen/the_bigger_picture back into upstream/master

upstream/master should be the target integration branch.

Due to features requested of Arquillian but unavailable in dependent projects, the "the_bigger_picture" branch was created to prototype upcoming, unstable development. Over time this has diverged from upstream/master and has become the current integration target, depending upon featureset branches from other projects.

This task is set to track the changes and dependencies required to get a working merge back into upstream/master.