change paths for leap webapp to be under /srv/leap/webapp from /srv/leap-webapp
add force => true parameter to webapp vcsrepo checkout

this should have been added to d669a5fb56acf9101cf677ecbd30bcc47b092cd3 resolve
#1722 after the vcsrepo module was updated to handle this, but it wasn't.
add requirements to the try::file resources

normally a file resource would automatically require the parent directory first,
but try::file doesn't do this so it has errors if /srv/leap/webapp doesn't exist yet:

for example:

   - [web1] err: /Stage[main]/Site_webapp/Try::File[/srv/leap/webapp/public/img]/Exec[restore_/srv/leap/webapp/public/img]/returns: change from notrun to 0 failed: Working directory '/srv/leap/webapp/public' does not exist

that was 'tried' before the vcsrepo was done which would have resolved that
problem. This makes sure that the vcsrepo is done first
Merge branch 'feature/switch-webapp-location' into develop

Conflicts:
	puppet/modules/site_webapp/manifests/init.pp

Resolved lint differences

Change-Id: Ifbc535ec844222c9f6f0dd71ac12742230bb64ee