Merge lp://qastaging/~unity-team/unity/x-sru3 into lp://qastaging/unity/7.4

CMakeLists.txt (+6/-0)
debian/changelog (+35/-0)
debian/control (+1/-0)
debian/libunity-core-6.0-9.install (+1/-1)
debian/unity-services.install (+1/-1)
debian/unity.install (+1/-0)
decorations/CMakeLists.txt (+1/-0)
decorations/DecoratedWindow.cpp (+101/-5)
decorations/DecoratedWindow.h (+1/-0)
decorations/DecorationsManager.cpp (+1/-1)
decorations/DecorationsPriv.h (+8/-0)
decorations/DecorationsShape.cpp (+107/-0)
decorations/DecorationsShape.h (+54/-0)
launcher/DeviceNotificationDisplay.h (+1/-1)
launcher/DeviceNotificationDisplayImp.cpp (+4/-26)
launcher/DeviceNotificationDisplayImp.h (+1/-1)
launcher/FileManagerLauncherIcon.cpp (+4/-2)
launcher/TrashLauncherIcon.cpp (+21/-17)
launcher/VolumeLauncherIcon.cpp (+1/-1)
lockscreen/LockScreenAcceleratorController.cpp (+12/-2)
plugins/unityshell/src/unityshell.cpp (+2/-1)
plugins/unityshell/unityshell.xml.in (+2/-0)
tests/test_mock_devices.h (+1/-1)
tests/test_unity_window_view.cpp (+6/-0)
tests/test_volume_launcher_icon.cpp (+2/-2)
tools/CMakeLists.txt (+22/-0)
tools/unity.cmake (+6/-0)
tools/unity_active_plugins_safety_check.cpp (+83/-0)
unity-shared/CompizUtils.cpp (+3/-4)
unity-shared/CompizUtils.h (+2/-1)
unity-shared/PluginAdapter.cpp (+1/-1)
unity-shared/TextInput.cpp (+4/-15)
unity-shared/TextInput.h (+0/-1)
unity-shared/UnityWindowView.cpp (+6/-1)
unity7.conf.in (+3/-0)