Merge proposals dependent on lp://staging/~woutervb/charms/trusty/folder-swift-sync/fix_sync_script

lp://staging/~woutervb/charms/trusty/folder-swift-sync/fix_sync_script has no merge proposals.