Merge proposals dependent on lp://qastaging/~vicamo/lxc-android-config/add-upstart-local-bridge

1. add-upstart-local-bridge
2. Dependent merge proposals