Framework uid now consists of aura js uid as well as resources uid. Any change in either will produce new framework uid. Also removing aura.fwuid parameter from resource requests.

@bug W-1756332@
@rev goliver@
Merging origin/bob/master-pending/include-resources-uid into master