Adding missing timeout config
Merge branch 'autoscaler_fix' of https://github.com/lasinducharith/stratos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos