Improve how File Lock feature works with nested items

Merged Valery Sizov requested to merge file_lock_nested_locks into master

fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/705

Recent screenshot: Screen_Shot_2016-06-23_at_12.12.20

Previous one joxi_screenshot_1466623505450