fix updatestable for elk. References #3296
Merge commit 'c88ad063f40b5b5d7a2f0e08e121d1c34eb0feae'