Update conflicts set
Only recommend reprepro. We don't want it by default.
Diable reprepro by default. Isolate builds by default.
Remove implicit values
Add some rails bits for testing
Ensure lxc recipe is included and force apt into run list for isolated
Force timeout in mixlib shellout higher than default
Merge remote-tracking branch 'upstream/develop' into develop