Revert "Bug 1764 - fixed features configuration for os-switch-config-pusher"

This reverts commit 7277056c8fd9e45289d2787740ea6bae9ef27428.

Change-Id: I6102d7efe8350fb120a1244085790d5d4c632422
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Revert "Bug 1764 - added karaf settings for os-switch-config-pusher"

This reverts commit af0bd4e43b1857966681468a7cdf51d5141a2756.

Change-Id: I6c31b719624d54e3a86c756b4729a0429a4842de
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Merge "Revert "Bug 1764 - added karaf settings for os-switch-config-pusher"" into stable/helium