Remove a mistakenly added module.
Fix stratos-installer bug - remove hard coded pack filename to setup.conf
conflicts fixed