Merge proposals dependent on lp:~free.ekanayaka/landscape-charm/fix-charm-offiline-paths-for-14.10

1. fix-charm-offiline-paths-for-14.10
2. Dependent merge proposals