Thomas's change to ensure tighter synchro between conf_files lxc_sliceimage and nodemanager
no functional change, just comments + cosmetic code change to be more similar to the lxc code
fix the way 'arch' is computed, as exposed to the guest XML template
Merge remote-tracking branch 'upstream/master'