More cleanup for naming of yard stacks and remotes vis a vis application kind
Also cleanup some uid yid stuff
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5
Merge pull request #16273 from SmithSamuelM/2014.7_sam5

More clean up of yard naming vis a vis application kind