BZ-12827 using neAddress directive
Merge branch 'RC20140821' into integration