1) Sync in patch for EDK 1063 Boot option enumeration algorithm enhancement

2) Sync in patch for EDK 1081: Enhance the BDS shell enumeration logic to skip the those not dispatched FVs in system.
3) Remove all EFI_SPECIFICATION_VERSION as all module should comply to UEFI 2.1 and later.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4798 6f19259b-4bc3-4df7-8a09-765794883524

MdeModulePkg/Library/GenericBdsLib/BdsConsole.c

@@ -21,7 +21,6 @@ Abstract:
 **/
 
 #include "InternalBdsLib.h"
-//@MT:#include "EfiPrintLib.h"
 
 BOOLEAN
 IsNvNeed (
@@ -228,9 +227,7 @@ BdsLibConnectConsoleVariable (
     //
     if ((DevicePathType (Instance) == MESSAGING_DEVICE_PATH) &&
        ((DevicePathSubType (Instance) == MSG_USB_CLASS_DP)
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
        || (DevicePathSubType (Instance) == MSG_USB_WWID_DP)
-#endif
        )) {
       //
       // Check the Usb console in Usb2.0 bus firstly, then Usb1.1 bus