make use of shortcut masterfiles

See https://github.com/cfengine/masterfiles/pull/312

It first tries to use the shortcut and if this fails fallback to old method for backwards compatibility
This addresses the issue in redmine #3697
inspired by Nick Anderson