When merging Views, allow the origin to be overriden

Signed-off-by: David Scott <dave.scott@citrix.com>
Print the empty path as '/'

This means messages like "Merge view to" now say "Merge view to /"

Signed-off-by: David Scott <dave.scott@citrix.com>
Merge pull request #1 from djs55/origin

Tweak view merging a little